diff -Nru libsoup2.4-2.52.2/aclocal.m4 libsoup2.4-2.54.1/aclocal.m4 --- libsoup2.4-2.52.2/aclocal.m4 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/aclocal.m4 2016-04-26 12:36:11.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -27,13 +27,13 @@ dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -dnl This file can can be used in projects which are not available under +dnl This file can be used in projects which are not available under dnl the GNU General Public License or the GNU Library General Public dnl License but which still want to provide support for the GNU gettext dnl functionality. dnl Please note that the actual code of the GNU gettext library is covered dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. +dnl gettext package is covered by the GNU General Public License. dnl They are *not* in the public domain. dnl Authors: @@ -480,7 +480,7 @@ rm -f conf.glibtest ]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -492,10 +492,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -511,14 +511,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -563,15 +563,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -602,7 +601,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -793,7 +792,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -869,7 +868,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -959,8 +958,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -1033,7 +1032,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1062,7 +1065,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1073,7 +1076,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -1083,7 +1086,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1104,7 +1107,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1154,7 +1157,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1193,7 +1196,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1222,7 +1225,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1269,7 +1272,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1288,7 +1291,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1369,7 +1372,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1429,7 +1432,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1457,7 +1460,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1476,7 +1479,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1609,7 +1612,7 @@ # Autoconf support for the Vala compiler -# Copyright (C) 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2008-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru libsoup2.4-2.52.2/build/Makefile.msvc-introspection libsoup2.4-2.54.1/build/Makefile.msvc-introspection --- libsoup2.4-2.52.2/build/Makefile.msvc-introspection 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/Makefile.msvc-introspection 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,125 @@ +# Author: Fan, Chun-wei +# Common autotools file for constructing the g-ir-scanner and +# g-ir-compiler command lines for Visual Studio builds. + +# This is copied from $(srcroot)/build from the gobject-introspection +# project, which may be included in projects that support both +# Visual Studio builds and introspection. + +# * Input variables: +# +# MSVC_INTROSPECT_GIRS - List of .gir's that should be built +# in the NMake Makefiles +# +# * Simple tutorial +# +# Add this to Makefile.am where your library/program is built: +# (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM +# is required unless --headers-only is specified in +# YourLib_1_0_gir__MSVC_SCANNERFLAGS) +# +# include $(top_srcdir)/build/Makefile.msvc-introspection +# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir +# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional +# YourLib_1_0_gir_VERSION = 1.0 # This is optional +# YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0 +# YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES) +# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram +# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files) +# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's) +# YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir) + +# Private functions + +## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable +## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 +_gir_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) + +# Namespace and Version is either fetched from the gir filename +# or the _NAMESPACE/_VERSION variable combo +_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1))))) +_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=)))) +_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc) + +# _PROGRAM is an optional variable which needs its own --program argument +_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM)) + +# Deduce the sub-folder from $(srcroot) where the sources reside in +_gir_source_path_raw_msvc:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) +_gir_source_path_msvc=$(subst /,\\,$(_gir_source_path_raw_msvc)) +_gir_source_subdir_int_msvc=$(subst \\\\,\\,\\$(_gir_source_path_msvc)\\) +_gir_source_subdir_msvc=$(subst \\.\\,\\,$(_gir_source_subdir_int_msvc)) + +_gir_files_raw_msvc=$(subst /,\\,$($(_gir_name)_MSVC_FILES)) +_gir_files_msvc=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc)))) + +# Create a list of items for: +# - Libraries +# - Packages +# - GIRs to include +# - packages to export + +_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib)) +_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg)) +_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include)) +_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg)) + +# +# Create NMake Makefile Sections for Building Introspection files +# from autotools files +# $(1) - File Name of the .gir that is to be generated +# + +define gir-nmake-builder + +# Basic sanity check, to make sure required variables are set +$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES)) +$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)), + $($(_gir_name)_MSVC_LIBS), + $($(_gir_name)_MSVC_PROGRAM)),, + $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM)) + +$(top_builddir)/build/win32/$(_gir_name)_list: + for F in $(_gir_files_msvc); do \ + case $$$$F in \ + *.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \ + echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \ + ;; \ + esac; \ + done + +$(top_builddir)/build/win32/$(1).msvc.introspect: + -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect + +# Assemble the Command to Run g-ir-scanner + echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect + +# Finally Assemble the Command to Compile the generated .gir + echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect + echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect +endef + +$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) diff -Nru libsoup2.4-2.52.2/build/Makefile.msvcproj libsoup2.4-2.54.1/build/Makefile.msvcproj --- libsoup2.4-2.52.2/build/Makefile.msvcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/Makefile.msvcproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,107 @@ +# Author: Fan, Chun-wei +# Common Autotools file used to generate Visual Studio 2008+ +# Projects from their templates + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# * Input variables: +# +# MSVCPROJS - List of Projects that should be generated +# +# * Simple tutorial +# +# Add this to Makefile.am where your library/program is built: +# include $(top_srcdir)/build/Makefile.msvcproj +# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) +# YourProject_FILES = $(libyourlib_1_0_SOURCES) +# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none +# YourProject_HEADERS_DIR = $(libyourlibincludedir) +# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) +# YourProject_HEADERS_EXCLUDES = ... # +# +# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) +# $(top_builddir)/build/win32/vs9/YourProject.vcproj \ +# $(top_builddir)/build/win32/vs9/YourProject.headers + + +# Private functions + +## Transform the MSVC project filename (no filename extensions) to something which can reference through a variable +## without automake/make complaining, eg Gtk-2.0 -> Gtk_2_0 +_proj_name=$(subst /,_,$(subst -,_,$(subst .,_,$(1)))) +_proj_path_raw:=$(subst $(abs_top_srcdir),,$(abs_srcdir)) +_proj_path=$(subst /,\\,$(_proj_path_raw)) +_proj_subdir_int=$(subst \\\\,\\,\\$(_proj_path)\\) +_proj_subdir=$(subst \\.\\,\\,$(_proj_subdir_int)) + +_proj_files_raw=$(subst /,\\,$($(_proj_name)_FILES)) +_proj_files=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) +_proj_filters=$($(_proj_name)_EXCLUDES) + +_proj_headers_raw=$(subst /,\\,$($(_proj_name)_HEADERS_INST)) +_proj_headers=$(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) +_proj_headers_excludes=$($(_proj_name)_HEADERS_EXCLUDES) + +_headers_dest_posix=$(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) +_headers_destdir=$(subst /,\\,$(_headers_dest_posix)) + +# +# Creates Visual Studio 2008/2010 projects from items passed in from autotools files +# $(1) - Base Name of the MSVC project files (outputs) +# + +define msvcproj-builder + +$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj + +$(top_builddir)/build/win32/vs9/$(1).vcproj: + -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj + -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + + for F in $(_proj_files); do \ + case $$$$F in \ + $(_proj_filters)) \ + ;; \ + *.c|*.cpp|*.cc|*.cxx) \ + echo ' ' >>$(1).sourcefiles && \ + echo ' ' >>$(1).vs10.sourcefiles && \ + echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ + ;; \ + esac; \ + done + + + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + $(RM) $(1).sourcefiles + $(RM) $(1).vs10.sourcefiles + $(RM) $(1).vs10.sourcefiles.filters + +$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers + +$(top_builddir)/build/win32/vs9/$(1).headers: + -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers + -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/build/win32/vs9/$(1).headers && \ + echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \ + ;; \ + esac; \ + done + +endef + +$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) diff -Nru libsoup2.4-2.52.2/build/Makefile-newvs.am libsoup2.4-2.54.1/build/Makefile-newvs.am --- libsoup2.4-2.52.2/build/Makefile-newvs.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/Makefile-newvs.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,45 @@ +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi diff -Nru libsoup2.4-2.52.2/build/win32/detectenv-msvc.mak libsoup2.4-2.54.1/build/win32/detectenv-msvc.mak --- libsoup2.4-2.52.2/build/win32/detectenv-msvc.mak 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/detectenv-msvc.mak 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,76 @@ +# Common NMake Makefile module for checking the build environment +# This can be copied from $(glib_srcroot)\build\win32 for GNOME items +# that support MSVC builds and introspection under MSVC, and can be used +# for building test programs as well. + +# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or +# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir) +!if !defined(VCINSTALLDIR) && !defined(WINDOWSSDKDIR) +MSG = ^ +This Makefile is only for Visual Studio 2008 and later.^ +You need to ensure that the Visual Studio Environment is properly set up^ +before running this Makefile. +!error $(MSG) +!endif + +ERRNUL = 2>NUL +_HASH=^# + +!if ![echo VCVERSION=_MSC_VER > vercl.x] \ + && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \ + && ![echo PLAT=Win32 >> vercl.x] \ + && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \ + && ![echo PLAT=x64 >> vercl.x] \ + && ![echo $(_HASH)endif >> vercl.x] \ + && ![cl -nologo -TC -P vercl.x $(ERRNUL)] +!include vercl.i +!if ![echo VCVER= ^\> vercl.vc] \ + && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc] +!include vercl.vc +!endif +!endif +!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc] +!endif + +!if $(VCVERSION) > 1499 && $(VCVERSION) < 1600 +VSVER = 9 +!elseif $(VCVERSION) > 1599 && $(VCVERSION) < 1700 +VSVER = 10 +!elseif $(VCVERSION) > 1699 && $(VCVERSION) < 1800 +VSVER = 11 +!elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900 +VSVER = 12 +!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000 +VSVER = 14 +!else +VSVER = 0 +!endif + +!if "$(VSVER)" == "0" +MSG = ^ +This NMake Makefile set supports Visual Studio^ +9 (2008) through 14 (2015). Your Visual Studio^ +version is not supported. +!error $(MSG) +!endif + +VALID_CFGSET = FALSE +!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" +VALID_CFGSET = TRUE +!endif + +# We want debugging symbols logged for all builds, +# using .pdb files for release builds +CFLAGS_BASE = /Zi + +!if "$(CFG)" == "release" || "$(CFG)" == "Release" +CFLAGS_ADD = /MD /O2 $(CFLAGS_BASE) +!else +CFLAGS_ADD = /MDd /Od $(CFLAGS_BASE) +!endif + +!if "$(PLAT)" == "x64" +LDFLAGS_ARCH = /machine:x64 +!else +LDFLAGS_ARCH = /machine:x86 +!endif diff -Nru libsoup2.4-2.52.2/build/win32/introspection.body.mak libsoup2.4-2.54.1/build/win32/introspection.body.mak --- libsoup2.4-2.52.2/build/win32/introspection.body.mak 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/introspection.body.mak 2016-04-26 12:36:43.000000000 +0000 @@ -0,0 +1,52 @@ +Soup-2.4.gir: Soup_2_4_gir_list + @-echo Generating $@... + $(PYTHON) $(G_IR_SCANNER) \ + --verbose -no-libtool \ + --namespace=Soup \ + --nsversion=2.4 \ + \ + --library=soup-2.4 \ + \ + --add-include-path=$(G_IR_INCLUDEDIR) \ + --include=Gio-2.0 \ + --pkg-export=libsoup-2.4 \ + --cflags-begin \ + -DG_LOG_DOMAIN="libsoup" -DLIBSOUP_COMPILATION -I../.. -DLIBSOUP_USE_UNSTABLE_REQUEST_API \ + --cflags-end \ + --c-include "libsoup/soup.h" \ + --filelist=Soup_2_4_gir_list \ + -o $@ + +Soup-2.4.typelib: Soup-2.4.gir + @-echo Compiling $@... + $(G_IR_COMPILER) \ + --includedir=. --debug --verbose \ + Soup-2.4.gir \ + -o $@ + +SoupGNOME-2.4.gir: SoupGNOME_2_4_gir_list Soup-2.4.gir + @-echo Generating $@... + $(PYTHON) $(G_IR_SCANNER) \ + --verbose -no-libtool \ + --namespace=SoupGNOME \ + --nsversion=2.4 \ + \ + --library=soup-gnome-2.4 --library=soup-2.4 \ + \ + --add-include-path=$(G_IR_INCLUDEDIR) \ + \ + --pkg-export=libsoup-gnome-2.4 \ + --cflags-begin \ + -DG_LOG_DOMAIN="libsoup" -DLIBSOUP_COMPILATION -I../.. \ + --cflags-end \ + i --identifier-prefix=Soup --symbol-prefix=soup --c-include "libsoup/soup-gnome.h" --include-uninstalled=./Soup-2.4.gir \ + --filelist=SoupGNOME_2_4_gir_list \ + -o $@ + +SoupGNOME-2.4.typelib: SoupGNOME-2.4.gir + @-echo Compiling $@... + $(G_IR_COMPILER) \ + --includedir=. --debug --verbose \ + SoupGNOME-2.4.gir \ + -o $@ + diff -Nru libsoup2.4-2.52.2/build/win32/introspection-msvc.mak libsoup2.4-2.54.1/build/win32/introspection-msvc.mak --- libsoup2.4-2.52.2/build/win32/introspection-msvc.mak 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/introspection-msvc.mak 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,94 @@ +# Common NMake Makefile module for checking the build environment is sane +# for building introspection files under MSVC/NMake. +# This can be copied from $(gi_srcroot)\build\win32 for GNOME items +# that support MSVC builds and introspection under MSVC. + +# Can override with env vars as needed +# You will need to have built gobject-introspection for this to work. +# Change or pass in or set the following to suit your environment + +!if "$(PREFIX)" == "" +PREFIX = ..\..\..\vs$(VSVER)\$(PLAT) +!endif + +!if ![setlocal] && \ + ![set PFX=$(PREFIX)] && \ + ![for %P in (%PFX%) do @echo PREFIX_FULL=%~dpnfP > pfx.x] +!endif +!include pfx.x + +!if "$(PKG_CONFIG_PATH)" == "" +PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig +!else +PKG_CONFIG_PATH=$(PREFIX_FULL)\lib\pkgconfig;$(PKG_CONFIG_PATH) +!endif + +!if ![del $(ERRNUL) /q/f pfx.x] +!endif + +# Note: The PYTHON must be the Python release series that was used to build +# the GObject-introspection scanner Python module! +# Either having python.exe your PATH will work or passing in +# PYTHON= will do + +# This is required, and gobject-introspection needs to be built +# before this can be successfully run. +!if "$(PYTHON)" == "" +PYTHON=python +!endif + +# Path to the pkg-config tool, if not already in the PATH +!if "$(PKG_CONFIG)" == "" +PKG_CONFIG=pkg-config +!endif + +# Don't change anything following this line! + +GIR_SUBDIR = share\gir-1.0 +GIR_TYPELIBDIR = lib\girepository-1.0 +G_IR_SCANNER = $(PREFIX)\bin\g-ir-scanner +G_IR_COMPILER = $(PREFIX)\bin\g-ir-compiler.exe +G_IR_INCLUDEDIR = $(PREFIX)\$(GIR_SUBDIR) +G_IR_TYPELIBDIR = $(PREFIX)\$(GIR_TYPELIBDIR) + +VALID_PKG_CONFIG_PATH = FALSE + +MSG_INVALID_PKGCONFIG = You must set or specifiy a valid PKG_CONFIG_PATH +MSG_INVALID_CFG = You need to specify or set CFG to be release or debug to use this Makefile to build the Introspection Files + +ERROR_MSG = + +BUILD_INTROSPECTION = TRUE + +!if ![set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)] \ + && ![$(PKG_CONFIG) --print-errors --errors-to-stdout $(CHECK_PACKAGE) > pkgconfig.x] \ + && ![setlocal] \ + && ![set file="pkgconfig.x"] \ + && ![FOR %A IN (%file%) DO @echo PKG_CHECK_SIZE=%~zA > pkgconfig.chksize] \ + && ![del $(ERRNUL) /q/f pkgconfig.x] +!endif + +!include pkgconfig.chksize +!if "$(PKG_CHECK_SIZE)" == "0" +VALID_PKG_CONFIG_PATH = TRUE +!else +VALID_PKG_CONFIG_PATH = FALSE +!endif + +!if ![del $(ERRNUL) /q/f pkgconfig.chksize] +!endif + +VALID_CFGSET = FALSE +!if "$(CFG)" == "release" || "$(CFG)" == "debug" || "$(CFG)" == "Release" || "$(CFG)" == "Debug" +VALID_CFGSET = TRUE +!endif + +!if "$(VALID_PKG_CONFIG_PATH)" != "TRUE" +BUILD_INTROSPECTION = FALSE +ERROR_MSG = $(MSG_INVALID_PKGCONFIG) +!endif + +!if "$(VALID_CFGSET)" != "TRUE" +BUILD_INTROSPECTION = FALSE +ERROR_MSG = $(MSG_INVALID_CFG) +!endif diff -Nru libsoup2.4-2.52.2/build/win32/Makefile.am libsoup2.4-2.54.1/build/win32/Makefile.am --- libsoup2.4-2.52.2/build/win32/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,32 @@ +SUBDIRS = vs9 vs10 vs11 vs12 vs14 + +if HAVE_INTROSPECTION +GENERATED_ITEMS = \ + introspection.body.mak \ + Soup_2_4_gir_list \ + SoupGNOME_2_4_gir_list + +MSVC_INTROSPECTION_INTERMEDIATE_FILES = Soup-2.4.gir.msvc.introspect SoupGNOME-2.4.gir.msvc.introspect + +introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) + -$(RM) introspection.body.mak + for F in `ls *.msvc.introspect`; do \ + case $$F in \ + *) cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \ + ;; \ + esac; \ + done + $(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) + +DISTCLEANFILES = $(GENERATED_ITEMS) + +else +GENERATED_ITEMS = +endif + +EXTRA_DIST = \ + replace.py \ + detectenv-msvc.mak \ + introspection-msvc.mak \ + soup-introspection-msvc.mak \ + $(GENERATED_ITEMS) diff -Nru libsoup2.4-2.52.2/build/win32/Makefile.in libsoup2.4-2.54.1/build/win32/Makefile.in --- libsoup2.4-2.52.2/build/win32/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -0,0 +1,725 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` +ETAGS = etags +CTAGS = ctags +DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APACHE_HTTPD = @APACHE_HTTPD@ +APACHE_MODULE_DIR = @APACHE_MODULE_DIR@ +APACHE_PHP_MODULE = @APACHE_PHP_MODULE@ +APACHE_PHP_MODULE_DIR = @APACHE_PHP_MODULE_DIR@ +APACHE_SSL_MODULE_DIR = @APACHE_SSL_MODULE_DIR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_GNOME = @HAVE_GNOME@ +HTML_DIR = @HTML_DIR@ +IF_HAVE_PHP = @IF_HAVE_PHP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHP = @PHP@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUP_AGE = @SOUP_AGE@ +SOUP_API_VERSION = @SOUP_API_VERSION@ +SOUP_CURRENT = @SOUP_CURRENT@ +SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ +SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ +SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ +SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ +SOUP_REVISION = @SOUP_REVISION@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VAPIDIR = @VAPIDIR@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XML_CFLAGS = @XML_CFLAGS@ +XML_LIBS = @XML_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ntlm_auth = @ntlm_auth@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +SUBDIRS = vs9 vs10 vs11 vs12 vs14 +@HAVE_INTROSPECTION_FALSE@GENERATED_ITEMS = +@HAVE_INTROSPECTION_TRUE@GENERATED_ITEMS = \ +@HAVE_INTROSPECTION_TRUE@ introspection.body.mak \ +@HAVE_INTROSPECTION_TRUE@ Soup_2_4_gir_list \ +@HAVE_INTROSPECTION_TRUE@ SoupGNOME_2_4_gir_list + +@HAVE_INTROSPECTION_TRUE@MSVC_INTROSPECTION_INTERMEDIATE_FILES = Soup-2.4.gir.msvc.introspect SoupGNOME-2.4.gir.msvc.introspect +@HAVE_INTROSPECTION_TRUE@DISTCLEANFILES = $(GENERATED_ITEMS) +EXTRA_DIST = \ + replace.py \ + detectenv-msvc.mak \ + introspection-msvc.mak \ + soup-introspection-msvc.mak \ + $(GENERATED_ITEMS) + +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +# This directory's subdirectories are mostly independent; you can cd +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || eval $$failcom; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + set x; \ + here=`pwd`; \ + if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + empty_fix=.; \ + else \ + include_option=--include; \ + empty_fix=; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test ! -f $$subdir/TAGS || \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ + $(am__define_uniq_tagged_files); \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ + fi +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ + test -z "$(CTAGS_ARGS)$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ + am__skip_mode_fix=: \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-recursive + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +html: html-recursive + +html-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-dvi: install-dvi-recursive + +install-dvi-am: + +install-exec-am: + +install-html: install-html-recursive + +install-html-am: + +install-info: install-info-recursive + +install-info-am: + +install-man: + +install-pdf: install-pdf-recursive + +install-pdf-am: + +install-ps: install-ps-recursive + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-recursive + +pdf-am: + +ps: ps-recursive + +ps-am: + +uninstall-am: + +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am tags tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +@HAVE_INTROSPECTION_TRUE@introspection.body.mak: $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) +@HAVE_INTROSPECTION_TRUE@ -$(RM) introspection.body.mak +@HAVE_INTROSPECTION_TRUE@ for F in `ls *.msvc.introspect`; do \ +@HAVE_INTROSPECTION_TRUE@ case $$F in \ +@HAVE_INTROSPECTION_TRUE@ *) cat $(top_builddir)/build/win32/$$F >>introspection.body.mak \ +@HAVE_INTROSPECTION_TRUE@ ;; \ +@HAVE_INTROSPECTION_TRUE@ esac; \ +@HAVE_INTROSPECTION_TRUE@ done +@HAVE_INTROSPECTION_TRUE@ $(RM) $(MSVC_INTROSPECTION_INTERMEDIATE_FILES) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libsoup2.4-2.52.2/build/win32/replace.py libsoup2.4-2.54.1/build/win32/replace.py --- libsoup2.4-2.52.2/build/win32/replace.py 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/replace.py 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,102 @@ +#!/usr/bin/python +# +# Simple utility script to manipulate +# certain types of strings in a file + +# This can be used in various projects where +# there is the need to replace strings in files, +# and is copied from GLib's $(srcroot)/build/win32 + +# Author: Fan, Chun-wei +# Date: September 03, 2014 + +import os +import sys +import re +import string +import argparse + +valid_actions = ['remove-prefix', + 'replace-var', + 'replace-str', + 'remove-str'] + +def replace(src, dest, instring, outstring): + with open(src, 'r') as s: + with open(dest, 'w') as d: + for line in s: + i = line.replace(instring, outstring) + d.write(i) + +def check_required_args(args, params): + for param in params: + if getattr(args, param, None) is None: + raise SystemExit('%s: error: --%s argument is required' % (__file__, param)) + +def warn_ignored_args(args, params): + for param in params: + if getattr(args, param, None) is not None: + print('%s: warning: --%s argument is ignored' % (__file__, param)) + +def main(argv): + + parser = argparse.ArgumentParser(description='Process strings in a file.') + parser.add_argument('-a', + '--action', + help='Action to carry out. Can be one of:\n' + 'remove-prefix\n' + 'replace-var\n' + 'replace-str\n' + 'remove-str', + choices=valid_actions) + parser.add_argument('-i', '--input', help='Input file') + parser.add_argument('-o', '--output', help='Output file') + parser.add_argument('--instring', help='String to replace or remove') + parser.add_argument('--var', help='Autotools variable name to replace') + parser.add_argument('--outstring', + help='New String to replace specified string or variable') + parser.add_argument('--removeprefix', help='Prefix of string to remove') + + args = parser.parse_args() + + input_string = '' + output_string = '' + + # We must have action, input, output for all operations + check_required_args(args, ['action','input','output']) + + # Build the arguments by the operation that is to be done, + # to be fed into replace() + + # Get rid of prefixes from a string + if args.action == 'remove-prefix': + check_required_args(args, ['instring','removeprefix']) + warn_ignored_args(args, ['outstring','var']) + input_string = args.removeprefix + args.instring + output_string = args.instring + + # Replace an m4-style variable (those surrounded by @...@) + if args.action == 'replace-var': + check_required_args(args, ['var','outstring']) + warn_ignored_args(args, ['instring','removeprefix']) + input_string = '@' + args.var + '@' + output_string = args.outstring + + # Replace a string + if args.action == 'replace-str': + check_required_args(args, ['instring','outstring']) + warn_ignored_args(args, ['var','removeprefix']) + input_string = args.instring + output_string = args.outstring + + # Remove a string + if args.action == 'remove-str': + check_required_args(args, ['instring']) + warn_ignored_args(args, ['var','outstring','removeprefix']) + input_string = args.instring + output_string = '' + + replace(args.input, args.output, input_string, output_string) + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff -Nru libsoup2.4-2.52.2/build/win32/Soup_2_4_gir_list libsoup2.4-2.54.1/build/win32/Soup_2_4_gir_list --- libsoup2.4-2.52.2/build/win32/Soup_2_4_gir_list 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/Soup_2_4_gir_list 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,122 @@ +..\..\libsoup\soup-address.h +..\..\libsoup\soup-auth.h +..\..\libsoup\soup-auth-domain.h +..\..\libsoup\soup-auth-domain-basic.h +..\..\libsoup\soup-auth-domain-digest.h +..\..\libsoup\soup-auth-manager.h +..\..\libsoup\soup-autocleanups.h +..\..\libsoup\soup-cache.h +..\..\libsoup\soup-content-decoder.h +..\..\libsoup\soup-content-sniffer.h +..\..\libsoup\soup-cookie.h +..\..\libsoup\soup-cookie-jar.h +..\..\libsoup\soup-cookie-jar-db.h +..\..\libsoup\soup-cookie-jar-text.h +..\..\libsoup\soup-date.h +..\..\libsoup\soup-form.h +..\..\libsoup\soup-headers.h +..\..\libsoup\soup-logger.h +..\..\libsoup\soup-message.h +..\..\libsoup\soup-message-body.h +..\..\libsoup\soup-message-headers.h +..\..\libsoup\soup-method.h +..\..\libsoup\soup-misc.h +..\..\libsoup\soup-multipart.h +..\..\libsoup\soup-multipart-input-stream.h +..\..\libsoup\soup-password-manager.h +..\..\libsoup\soup-portability.h +..\..\libsoup\soup-proxy-resolver-default.h +..\..\libsoup\soup-proxy-uri-resolver.h +..\..\libsoup\soup-request.h +..\..\libsoup\soup-request-data.h +..\..\libsoup\soup-request-file.h +..\..\libsoup\soup-request-http.h +..\..\libsoup\soup-requester.h +..\..\libsoup\soup-server.h +..\..\libsoup\soup-session.h +..\..\libsoup\soup-session-async.h +..\..\libsoup\soup-session-feature.h +..\..\libsoup\soup-session-sync.h +..\..\libsoup\soup-socket.h +..\..\libsoup\soup-status.h +..\..\libsoup\soup-tld.h +..\..\libsoup\soup-types.h +..\..\libsoup\soup-uri.h +..\..\libsoup\soup-value-utils.h +..\..\libsoup\soup-websocket.h +..\..\libsoup\soup-websocket-connection.h +..\..\libsoup\soup-xmlrpc.h +..\..\libsoup\soup-xmlrpc-old.h +..\..\libsoup\soup-address.c +..\..\libsoup\soup-auth.c +..\..\libsoup\soup-auth-basic.c +..\..\libsoup\soup-auth-digest.c +..\..\libsoup\soup-auth-ntlm.c +..\..\libsoup\soup-auth-domain.c +..\..\libsoup\soup-auth-domain-basic.c +..\..\libsoup\soup-auth-domain-digest.c +..\..\libsoup\soup-auth-manager.c +..\..\libsoup\soup-body-input-stream.c +..\..\libsoup\soup-body-output-stream.c +..\..\libsoup\soup-cache.c +..\..\libsoup\soup-cache-client-input-stream.c +..\..\libsoup\soup-cache-input-stream.c +..\..\libsoup\soup-client-input-stream.c +..\..\libsoup\soup-connection.c +..\..\libsoup\soup-connection-auth.c +..\..\libsoup\soup-content-decoder.c +..\..\libsoup\soup-content-processor.c +..\..\libsoup\soup-content-sniffer.c +..\..\libsoup\soup-content-sniffer-stream.c +..\..\libsoup\soup-converter-wrapper.c +..\..\libsoup\soup-cookie.c +..\..\libsoup\soup-cookie-jar.c +..\..\libsoup\soup-cookie-jar-db.c +..\..\libsoup\soup-cookie-jar-text.c +..\..\libsoup\soup-date.c +..\..\libsoup\soup-directory-input-stream.c +..\..\libsoup\soup-filter-input-stream.c +..\..\libsoup\soup-form.c +..\..\libsoup\soup-headers.c +..\..\libsoup\soup-init.c +..\..\libsoup\soup-io-stream.c +..\..\libsoup\soup-logger.c +..\..\libsoup\soup-message.c +..\..\libsoup\soup-message-body.c +..\..\libsoup\soup-message-client-io.c +..\..\libsoup\soup-message-headers.c +..\..\libsoup\soup-message-io.c +..\..\libsoup\soup-message-queue.c +..\..\libsoup\soup-message-server-io.c +..\..\libsoup\soup-method.c +..\..\libsoup\soup-misc.c +..\..\libsoup\soup-multipart.c +..\..\libsoup\soup-multipart-input-stream.c +..\..\libsoup\soup-password-manager.c +..\..\libsoup\soup-path-map.c +..\..\libsoup\soup-proxy-resolver.c +..\..\libsoup\soup-proxy-resolver-default.c +..\..\libsoup\soup-proxy-resolver-wrapper.c +..\..\libsoup\soup-proxy-uri-resolver.c +..\..\libsoup\soup-request.c +..\..\libsoup\soup-request-data.c +..\..\libsoup\soup-request-file.c +..\..\libsoup\soup-request-http.c +..\..\libsoup\soup-requester.c +..\..\libsoup\soup-server.c +..\..\libsoup\soup-session.c +..\..\libsoup\soup-session-async.c +..\..\libsoup\soup-session-feature.c +..\..\libsoup\soup-session-sync.c +..\..\libsoup\soup-socket.c +..\..\libsoup\soup-socket-properties.c +..\..\libsoup\soup-status.c +..\..\libsoup\soup-tld.c +..\..\libsoup\soup-uri.c +..\..\libsoup\soup-value-utils.c +..\..\libsoup\soup-version.c +..\..\libsoup\soup-websocket.c +..\..\libsoup\soup-websocket-connection.c +..\..\libsoup\soup-xmlrpc.c +..\..\libsoup\soup-xmlrpc-old.c +..\..\libsoup\soup-enum-types.h diff -Nru libsoup2.4-2.52.2/build/win32/SoupGNOME_2_4_gir_list libsoup2.4-2.54.1/build/win32/SoupGNOME_2_4_gir_list --- libsoup2.4-2.52.2/build/win32/SoupGNOME_2_4_gir_list 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/SoupGNOME_2_4_gir_list 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,6 @@ +..\..\libsoup\soup-cookie-jar-sqlite.h +..\..\libsoup\soup-gnome-features.h +..\..\libsoup\soup-cookie-jar-sqlite.c +..\..\libsoup\soup-gnome-features.c +..\..\libsoup\soup-proxy-resolver-gnome.c +..\..\libsoup\soup-password-manager-gnome.c diff -Nru libsoup2.4-2.52.2/build/win32/soup-introspection-msvc.mak libsoup2.4-2.54.1/build/win32/soup-introspection-msvc.mak --- libsoup2.4-2.52.2/build/win32/soup-introspection-msvc.mak 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/soup-introspection-msvc.mak 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,37 @@ +# NMake Makefile to build Introspection Files for Pango + +!include detectenv-msvc.mak + +APIVERSION = 2.4 + +CHECK_PACKAGE = gio-2.0 + +!include introspection-msvc.mak + +!if "$(BUILD_INTROSPECTION)" == "TRUE" + +INTROSPECTION_TARGETS = Soup-$(APIVERSION).gir Soup-$(APIVERSION).typelib SoupGNOME-$(APIVERSION).gir SoupGNOME-$(APIVERSION).typelib + +all: setbuildenv $(INTROSPECTION_TARGETS) + +install-introspection: all + @-copy Soup-$(APIVERSION).gir $(G_IR_INCLUDEDIR) + @-copy /b Soup-$(APIVERSION).typelib $(G_IR_TYPELIBDIR) + @-copy SoupGNOME-$(APIVERSION).gir $(G_IR_INCLUDEDIR) + @-copy /b SoupGNOME-$(APIVERSION).typelib $(G_IR_TYPELIBDIR) + +setbuildenv: + @set PYTHONPATH=$(PREFIX)\lib\gobject-introspection + @set PATH=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\bin;$(PATH) + @set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) + @set LIB=vs$(VSVER)\$(CFG)\$(PLAT)\bin;$(PREFIX)\lib;$(LIB) + +!include introspection.body.mak + +!else +all: + @-echo $(ERROR_MSG) +!endif + +clean: + @-del /f/q $(INTROSPECTION_TARGETS) diff -Nru libsoup2.4-2.52.2/build/win32/vs10/get.vcxproj libsoup2.4-2.54.1/build/win32/vs10/get.vcxproj --- libsoup2.4-2.52.2/build/win32/vs10/get.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/get.vcxproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B24831C4-B8F2-41D6-AAF4-12192F71C623} + get + Win32Proj + + + + Application + Unicode + v100 + true + + + Application + Unicode + v100 + + + Application + Unicode + v100 + true + + + Application + Unicode + v100 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/get.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs10/get.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs10/get.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/get.vcxproj.filters 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/libsoup.sln libsoup2.4-2.54.1/build/win32/vs10/libsoup.sln --- libsoup2.4-2.52.2/build/win32/vs10/libsoup.sln 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/libsoup.sln 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,128 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup", "soup.vcxproj", "{D83A3162-B14C-459C-AF81-15BBFA90240D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-gnome", "soup-gnome.vcxproj", "{8C88A385-28C8-4B30-91A4-FBA381A5A46F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get", "get.vcxproj", "{B24831C4-B8F2-41D6-AAF4-12192F71C623}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-httpd", "simple-httpd.vcxproj", "{80DC062E-2146-4CE8-A448-FD2205AB2CA4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-proxy", "simple-proxy.vcxproj", "{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-install", "soup-install.vcxproj", "{E0DCF460-914F-46F9-94D6-86D456CB53E9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Debug_MIT_GSSAPI|Win32 = Debug_MIT_GSSAPI|Win32 + Debug_MIT_GSSAPI|x64 = Debug_MIT_GSSAPI|x64 + Release_MIT_GSSAPI|Win32 = Release_MIT_GSSAPI|Win32 + Release_MIT_GSSAPI|x64 = Release_MIT_GSSAPI|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.Build.0 = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.ActiveCfg = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.Build.0 = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.ActiveCfg = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug_MIT_GSSAPI|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.Build.0 = Debug_MIT_GSSAPI|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.Build.0 = Release_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.ActiveCfg = Release_MIT_GSSAPI|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.Build.0 = Release_MIT_GSSAPI|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru libsoup2.4-2.52.2/build/win32/vs10/Makefile.am libsoup2.4-2.54.1/build/win32/vs10/Makefile.am --- libsoup2.4-2.52.2/build/win32/vs10/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,34 @@ +GENERATED_ITEMS = \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +MSVC_HEADERS_LIST = soup.vs10.headers soup-gnome.vs10.headers + +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + soup-install.vcxproj \ + get.vcxproj.filters \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxprojin \ + soup-gnome.vcxprojin \ + soup.vcxproj.filtersin \ + soup-gnome.vcxproj.filtersin \ + soup-install.propsin \ + $(GENERATED_ITEMS) + +soup-install.props: $(top_srcdir)/build/win32/vs10/soup-install.propsin $(MSVC_HEADERS_LIST) + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/soup-install.propsin >$@ + rm $(MSVC_HEADERS_LIST) + +DISTCLEANFILES = $(GENERATED_ITEMS) diff -Nru libsoup2.4-2.52.2/build/win32/vs10/Makefile.in libsoup2.4-2.54.1/build/win32/vs10/Makefile.in --- libsoup2.4-2.52.2/build/win32/vs10/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -0,0 +1,555 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32/vs10 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = soup-gen-srcs.props +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/soup-gen-srcs.props.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APACHE_HTTPD = @APACHE_HTTPD@ +APACHE_MODULE_DIR = @APACHE_MODULE_DIR@ +APACHE_PHP_MODULE = @APACHE_PHP_MODULE@ +APACHE_PHP_MODULE_DIR = @APACHE_PHP_MODULE_DIR@ +APACHE_SSL_MODULE_DIR = @APACHE_SSL_MODULE_DIR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_GNOME = @HAVE_GNOME@ +HTML_DIR = @HTML_DIR@ +IF_HAVE_PHP = @IF_HAVE_PHP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHP = @PHP@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUP_AGE = @SOUP_AGE@ +SOUP_API_VERSION = @SOUP_API_VERSION@ +SOUP_CURRENT = @SOUP_CURRENT@ +SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ +SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ +SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ +SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ +SOUP_REVISION = @SOUP_REVISION@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VAPIDIR = @VAPIDIR@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XML_CFLAGS = @XML_CFLAGS@ +XML_LIBS = @XML_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ntlm_auth = @ntlm_auth@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GENERATED_ITEMS = \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +MSVC_HEADERS_LIST = soup.vs10.headers soup-gnome.vs10.headers +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + soup-install.vcxproj \ + get.vcxproj.filters \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxprojin \ + soup-gnome.vcxprojin \ + soup.vcxproj.filtersin \ + soup-gnome.vcxproj.filtersin \ + soup-install.propsin \ + $(GENERATED_ITEMS) + +DISTCLEANFILES = $(GENERATED_ITEMS) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs10/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/vs10/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +soup-gen-srcs.props: $(top_builddir)/config.status $(srcdir)/soup-gen-srcs.props.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +soup-install.props: $(top_srcdir)/build/win32/vs10/soup-install.propsin $(MSVC_HEADERS_LIST) + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/soup-install.propsin >$@ + rm $(MSVC_HEADERS_LIST) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libsoup2.4-2.52.2/build/win32/vs10/simple-httpd.vcxproj libsoup2.4-2.54.1/build/win32/vs10/simple-httpd.vcxproj --- libsoup2.4-2.52.2/build/win32/vs10/simple-httpd.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/simple-httpd.vcxproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {80DC062E-2146-4CE8-A448-FD2205AB2CA4} + simplehttpd + Win32Proj + + + + Application + Unicode + v100 + true + + + Application + Unicode + v100 + + + Application + Unicode + v100 + true + + + Application + Unicode + v100 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/simple-httpd.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs10/simple-httpd.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs10/simple-httpd.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/simple-httpd.vcxproj.filters 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/simple-proxy.vcxproj libsoup2.4-2.54.1/build/win32/vs10/simple-proxy.vcxproj --- libsoup2.4-2.52.2/build/win32/vs10/simple-proxy.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/simple-proxy.vcxproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E} + simpleproxy + Win32Proj + + + + Application + Unicode + v100 + true + + + Application + Unicode + v100 + + + Application + Unicode + v100 + true + + + Application + Unicode + v100 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/simple-proxy.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs10/simple-proxy.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs10/simple-proxy.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/simple-proxy.vcxproj.filters 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-build-defines.props libsoup2.4-2.54.1/build/win32/vs10/soup-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs10/soup-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-build-defines.props 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + <_PropertySheetDisplayName>soupbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + true + /d2Zi+ %(AdditionalOptions) + + + gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-dll-build-defines.props libsoup2.4-2.54.1/build/win32/vs10/soup-dll-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs10/soup-dll-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-dll-build-defines.props 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,24 @@ + + + + + + + LIBSOUP_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="libsoup" + LIBSOUP_HAVE_GSSAPI + libxml2.lib;sqlite3.lib;intl.lib;ws2_32.lib + gssapi + 32.lib + 64.lib + + + <_PropertySheetDisplayName>soupdllbuilddefinesprops + + + + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).dll + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).pdb + $(OutDir)$(ProjectName)-$(ApiVersion).lib + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-gen-srcs.props libsoup2.4-2.54.1/build/win32/vs10/soup-gen-srcs.props --- libsoup2.4-2.52.2/build/win32/vs10/soup-gen-srcs.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-gen-srcs.props 2016-04-26 12:36:14.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + copy ..\..\..\config.h.win32 ..\..\..\config.h + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.in --output=..\..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=2 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp1 --output=..\..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=54 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp2 --output=..\..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=1 + +del ..\..\..\libsoup\soup-version.h.tmp1 ..\..\..\libsoup\soup-version.h.tmp2 + + + $(PythonPath)\python.exe ..\..\..\libsoup\tld-parser.py ..\..\..\data\effective_tld_names.dat ..\..\..\libsoup\tld_data.inc + + + <_PropertySheetDisplayName>soupgensrcsprops + + + + + $(CopyConfigH) + + + $(GenSoupVersionH) + + + $(GenTldDataInc) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-gen-srcs.props.in libsoup2.4-2.54.1/build/win32/vs10/soup-gen-srcs.props.in --- libsoup2.4-2.52.2/build/win32/vs10/soup-gen-srcs.props.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-gen-srcs.props.in 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + copy ..\..\..\config.h.win32 ..\..\..\config.h + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.in --output=..\..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=@SOUP_MAJOR_VERSION@ + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp1 --output=..\..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=@SOUP_MINOR_VERSION@ + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp2 --output=..\..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=@SOUP_MICRO_VERSION@ + +del ..\..\..\libsoup\soup-version.h.tmp1 ..\..\..\libsoup\soup-version.h.tmp2 + + + $(PythonPath)\python.exe ..\..\..\libsoup\tld-parser.py ..\..\..\data\effective_tld_names.dat ..\..\..\libsoup\tld_data.inc + + + <_PropertySheetDisplayName>soupgensrcsprops + + + + + $(CopyConfigH) + + + $(GenSoupVersionH) + + + $(GenTldDataInc) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxproj libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxproj --- libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxproj 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C88A385-28C8-4B30-91A4-FBA381A5A46F} + soupgnome + Win32Proj + + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxproj.filters 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxproj.filtersin libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxproj.filtersin --- libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxproj.filtersin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxproj.filtersin 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + +#include "soup-gnome.vs10.sourcefiles.filters" + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxprojin libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxprojin --- libsoup2.4-2.52.2/build/win32/vs10/soup-gnome.vcxprojin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-gnome.vcxprojin 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C88A385-28C8-4B30-91A4-FBA381A5A46F} + soupgnome + Win32Proj + + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + +#include "soup-gnome.vs10.sourcefiles" + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-install.props libsoup2.4-2.54.1/build/win32/vs10/soup-install.props --- libsoup2.4-2.52.2/build/win32/vs10/soup-install.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-install.props 2016-04-26 12:36:43.000000000 +0000 @@ -0,0 +1,91 @@ + + + + + + + +mkdir $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.pdb $(CopyDir)\bin +mkdir $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-$(ApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-gnome-$(ApiVersion).lib $(CopyDir)\lib +mkdir $(CopyDir)\include\libsoup-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup.h $(CopyDir)\include\libsoup-2.4\libsoup\soup.h +copy ..\..\..\libsoup\soup-address.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-address.h +copy ..\..\..\libsoup\soup-auth.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth.h +copy ..\..\..\libsoup\soup-auth-domain.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain.h +copy ..\..\..\libsoup\soup-auth-domain-basic.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-basic.h +copy ..\..\..\libsoup\soup-auth-domain-digest.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-digest.h +copy ..\..\..\libsoup\soup-auth-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-manager.h +copy ..\..\..\libsoup\soup-autocleanups.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-autocleanups.h +copy ..\..\..\libsoup\soup-cache.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cache.h +copy ..\..\..\libsoup\soup-content-decoder.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-decoder.h +copy ..\..\..\libsoup\soup-content-sniffer.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-sniffer.h +copy ..\..\..\libsoup\soup-cookie.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie.h +copy ..\..\..\libsoup\soup-cookie-jar.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar.h +copy ..\..\..\libsoup\soup-cookie-jar-db.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-db.h +copy ..\..\..\libsoup\soup-cookie-jar-text.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-text.h +copy ..\..\..\libsoup\soup-date.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-date.h +copy ..\..\..\libsoup\soup-form.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-form.h +copy ..\..\..\libsoup\soup-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-headers.h +copy ..\..\..\libsoup\soup-logger.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-logger.h +copy ..\..\..\libsoup\soup-message.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message.h +copy ..\..\..\libsoup\soup-message-body.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-body.h +copy ..\..\..\libsoup\soup-message-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-headers.h +copy ..\..\..\libsoup\soup-method.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-method.h +copy ..\..\..\libsoup\soup-misc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-misc.h +copy ..\..\..\libsoup\soup-multipart.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart.h +copy ..\..\..\libsoup\soup-multipart-input-stream.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart-input-stream.h +copy ..\..\..\libsoup\soup-password-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-password-manager.h +copy ..\..\..\libsoup\soup-portability.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-portability.h +copy ..\..\..\libsoup\soup-proxy-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver.h +copy ..\..\..\libsoup\soup-proxy-resolver-default.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver-default.h +copy ..\..\..\libsoup\soup-proxy-uri-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-uri-resolver.h +copy ..\..\..\libsoup\soup-request.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request.h +copy ..\..\..\libsoup\soup-request-data.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-data.h +copy ..\..\..\libsoup\soup-request-file.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-file.h +copy ..\..\..\libsoup\soup-request-http.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-http.h +copy ..\..\..\libsoup\soup-requester.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-requester.h +copy ..\..\..\libsoup\soup-server.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-server.h +copy ..\..\..\libsoup\soup-session.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session.h +copy ..\..\..\libsoup\soup-session-async.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-async.h +copy ..\..\..\libsoup\soup-session-feature.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-feature.h +copy ..\..\..\libsoup\soup-session-sync.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-sync.h +copy ..\..\..\libsoup\soup-socket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-socket.h +copy ..\..\..\libsoup\soup-status.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-status.h +copy ..\..\..\libsoup\soup-tld.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-tld.h +copy ..\..\..\libsoup\soup-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-types.h +copy ..\..\..\libsoup\soup-uri.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-uri.h +copy ..\..\..\libsoup\soup-value-utils.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-value-utils.h +copy ..\..\..\libsoup\soup-websocket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket.h +copy ..\..\..\libsoup\soup-websocket-connection.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket-connection.h +copy ..\..\..\libsoup\soup-xmlrpc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc.h +copy ..\..\..\libsoup\soup-xmlrpc-old.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc-old.h +copy ..\..\..\libsoup\soup-enum-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-enum-types.h +copy ..\..\..\libsoup\soup-version.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-version.h +mkdir $(CopyDir)\include\libsoup-gnome-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup-cookie-jar-sqlite.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-cookie-jar-sqlite.h +copy ..\..\..\libsoup\soup-gnome.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome.h +copy ..\..\..\libsoup\soup-gnome-features.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome-features.h + + + + <_PropertySheetDisplayName>pangoinstallprops + + + + + $(SoupDoInstall) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-install.propsin libsoup2.4-2.54.1/build/win32/vs10/soup-install.propsin --- libsoup2.4-2.52.2/build/win32/vs10/soup-install.propsin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-install.propsin 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,41 @@ + + + + + + + +mkdir $(CopyDir)\bin + +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.pdb $(CopyDir)\bin + +mkdir $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-$(ApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-gnome-$(ApiVersion).lib $(CopyDir)\lib + +mkdir $(CopyDir)\include\libsoup-$(ApiVersion)\libsoup +#include "soup.vs10.headers" + +mkdir $(CopyDir)\include\libsoup-gnome-$(ApiVersion)\libsoup +#include "soup-gnome.vs10.headers" + + + + <_PropertySheetDisplayName>pangoinstallprops + + + + + $(SoupDoInstall) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-install.vcxproj libsoup2.4-2.54.1/build/win32/vs10/soup-install.vcxproj --- libsoup2.4-2.52.2/build/win32/vs10/soup-install.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-install.vcxproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E0DCF460-914F-46F9-94D6-86D456CB53E9} + soupinstall + + + + Utility + MultiByte + v100 + true + + + Utility + MultiByte + v100 + + + Utility + MultiByte + v100 + true + + + Utility + MultiByte + v100 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + + + + + {b24831c4-b8f2-41d6-aaf4-12192f71c623} + false + + + {80dc062e-2146-4ce8-a448-fd2205ab2ca4} + false + + + {3ad0cb92-ee38-425e-83cb-e7b1cb1d305e} + false + + + {8c88a385-28c8-4b30-91a4-fba381a5a46f} + false + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup.vcxproj libsoup2.4-2.54.1/build/win32/vs10/soup.vcxproj --- libsoup2.4-2.52.2/build/win32/vs10/soup.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup.vcxproj 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,285 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D83A3162-B14C-459C-AF81-15BBFA90240D} + soup + Win32Proj + + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + + + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs10/soup.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs10/soup.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup.vcxproj.filters 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,94 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + Resource Files + Resource Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup.vcxproj.filtersin libsoup2.4-2.54.1/build/win32/vs10/soup.vcxproj.filtersin --- libsoup2.4-2.52.2/build/win32/vs10/soup.vcxproj.filtersin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup.vcxproj.filtersin 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + +#include "soup.vs10.sourcefiles.filters" + + + Resource Files + Resource Files + Resource Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup.vcxprojin libsoup2.4-2.54.1/build/win32/vs10/soup.vcxprojin --- libsoup2.4-2.52.2/build/win32/vs10/soup.vcxprojin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup.vcxprojin 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,381 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + Debug_MIT_GSSAPI + Win32 + + + Debug_MIT_GSSAPI + x64 + + + Release_MIT_GSSAPI + Win32 + + + Release_MIT_GSSAPI + x64 + + + + {D83A3162-B14C-459C-AF81-15BBFA90240D} + soup + Win32Proj + + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + + + DynamicLibrary + Unicode + v100 + true + + + DynamicLibrary + Unicode + v100 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + trueDebug\$(Platform)\bin\ + trueDebug\$(Platform)\bin\ + falseRelease\$(Platform)\bin\ + falseRelease\$(Platform)\bin\ + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX86 + + + + + Disabled + _DEBUG;$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX86);%(AdditionalDependencies) + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX86);%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX64 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX64);%(AdditionalDependencies) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);$(SoupMITGSSAPIBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);$(MITGSSAPILibBaseName)$(MITGSSAPILibNameSuffixX64);%(AdditionalDependencies) + true + Windows + true + true + MachineX64 + + + +#include "soup.vs10.sourcefiles" + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + + + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs10/soup-version-paths.props libsoup2.4-2.54.1/build/win32/vs10/soup-version-paths.props --- libsoup2.4-2.52.2/build/win32/vs10/soup-version-paths.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs10/soup-version-paths.props 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + 10 + ..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + 2.4 + lib + -$(ApiVersion)-0 + + -$(ApiVersion)-vs$(VSVer) + $(SoupSeparateVSDllPrefix) + $(SoupSeparateVSDllSuffix) + c:\python27 + + + <_PropertySheetDisplayName>soupversionpathsprops + + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(ApiVersion) + + + $(SoupLibtoolCompatibleDllPrefix) + + + $(SoupLibtoolCompatibleDllSuffix) + + + $(SoupSeparateVSDllPrefix) + + + $(SoupSeparateVSDllSuffix) + + + $(SoupDllPrefix) + + + $(SoupDllSuffix) + + + $(PythonPath) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/get.vcxproj libsoup2.4-2.54.1/build/win32/vs11/get.vcxproj --- libsoup2.4-2.52.2/build/win32/vs11/get.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/get.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B24831C4-B8F2-41D6-AAF4-12192F71C623} + get + Win32Proj + + + + Application + Unicode + v110 + true + + + Application + Unicode + v110 + + + Application + Unicode + v110 + true + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/get.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs11/get.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs11/get.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/get.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/libsoup.sln libsoup2.4-2.54.1/build/win32/vs11/libsoup.sln --- libsoup2.4-2.52.2/build/win32/vs11/libsoup.sln 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/libsoup.sln 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,76 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup", "soup.vcxproj", "{D83A3162-B14C-459C-AF81-15BBFA90240D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-gnome", "soup-gnome.vcxproj", "{8C88A385-28C8-4B30-91A4-FBA381A5A46F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get", "get.vcxproj", "{B24831C4-B8F2-41D6-AAF4-12192F71C623}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-httpd", "simple-httpd.vcxproj", "{80DC062E-2146-4CE8-A448-FD2205AB2CA4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-proxy", "simple-proxy.vcxproj", "{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-install", "soup-install.vcxproj", "{E0DCF460-914F-46F9-94D6-86D456CB53E9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.Build.0 = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.ActiveCfg = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.Build.0 = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.ActiveCfg = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru libsoup2.4-2.52.2/build/win32/vs11/Makefile.am libsoup2.4-2.54.1/build/win32/vs11/Makefile.am --- libsoup2.4-2.52.2/build/win32/vs11/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,26 @@ +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + soup-install.vcxproj \ + get.vcxproj.filters \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +DISTCLEANFILES = $(EXTRA_DIST) + +MSVC_VER = 11 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 2012 + +include $(top_srcdir)/build/Makefile-newvs.am diff -Nru libsoup2.4-2.52.2/build/win32/vs11/Makefile.in libsoup2.4-2.54.1/build/win32/vs11/Makefile.in --- libsoup2.4-2.52.2/build/win32/vs11/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -0,0 +1,590 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32/vs11 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/Makefile-newvs.am +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APACHE_HTTPD = @APACHE_HTTPD@ +APACHE_MODULE_DIR = @APACHE_MODULE_DIR@ +APACHE_PHP_MODULE = @APACHE_PHP_MODULE@ +APACHE_PHP_MODULE_DIR = @APACHE_PHP_MODULE_DIR@ +APACHE_SSL_MODULE_DIR = @APACHE_SSL_MODULE_DIR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_GNOME = @HAVE_GNOME@ +HTML_DIR = @HTML_DIR@ +IF_HAVE_PHP = @IF_HAVE_PHP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHP = @PHP@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUP_AGE = @SOUP_AGE@ +SOUP_API_VERSION = @SOUP_API_VERSION@ +SOUP_CURRENT = @SOUP_CURRENT@ +SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ +SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ +SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ +SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ +SOUP_REVISION = @SOUP_REVISION@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VAPIDIR = @VAPIDIR@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XML_CFLAGS = @XML_CFLAGS@ +XML_LIBS = @XML_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ntlm_auth = @ntlm_auth@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + soup-install.vcxproj \ + get.vcxproj.filters \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +DISTCLEANFILES = $(EXTRA_DIST) +MSVC_VER = 11 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 2012 +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile-newvs.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs11/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/vs11/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/build/Makefile-newvs.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libsoup2.4-2.52.2/build/win32/vs11/simple-httpd.vcxproj libsoup2.4-2.54.1/build/win32/vs11/simple-httpd.vcxproj --- libsoup2.4-2.52.2/build/win32/vs11/simple-httpd.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/simple-httpd.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {80DC062E-2146-4CE8-A448-FD2205AB2CA4} + simplehttpd + Win32Proj + + + + Application + Unicode + v110 + true + + + Application + Unicode + v110 + + + Application + Unicode + v110 + true + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/simple-httpd.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs11/simple-httpd.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs11/simple-httpd.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/simple-httpd.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/simple-proxy.vcxproj libsoup2.4-2.54.1/build/win32/vs11/simple-proxy.vcxproj --- libsoup2.4-2.52.2/build/win32/vs11/simple-proxy.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/simple-proxy.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E} + simpleproxy + Win32Proj + + + + Application + Unicode + v110 + true + + + Application + Unicode + v110 + + + Application + Unicode + v110 + true + + + Application + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/simple-proxy.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs11/simple-proxy.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs11/simple-proxy.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/simple-proxy.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-build-defines.props libsoup2.4-2.54.1/build/win32/vs11/soup-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs11/soup-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-build-defines.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + <_PropertySheetDisplayName>soupbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + true + /d2Zi+ %(AdditionalOptions) + + + gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-dll-build-defines.props libsoup2.4-2.54.1/build/win32/vs11/soup-dll-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs11/soup-dll-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-dll-build-defines.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + + + LIBSOUP_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="libsoup" + libxml2.lib;sqlite3.lib;intl.lib;ws2_32.lib + + + <_PropertySheetDisplayName>soupdllbuilddefinesprops + + + + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).dll + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).pdb + $(OutDir)$(ProjectName)-$(ApiVersion).lib + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-gen-srcs.props libsoup2.4-2.54.1/build/win32/vs11/soup-gen-srcs.props --- libsoup2.4-2.52.2/build/win32/vs11/soup-gen-srcs.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-gen-srcs.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + copy ..\..\..\config.h.win32 ..\..\..\config.h + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.in --output=..\..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=2 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp1 --output=..\..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=53 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp2 --output=..\..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=2 + +del ..\..\..\libsoup\soup-version.h.tmp1 ..\..\..\libsoup\soup-version.h.tmp2 + + + $(PythonPath)\python.exe ..\..\..\libsoup\tld-parser.py ..\..\..\data\effective_tld_names.dat ..\..\..\libsoup\tld_data.inc + + + <_PropertySheetDisplayName>soupgensrcsprops + + + + + $(CopyConfigH) + + + $(GenSoupVersionH) + + + $(GenTldDataInc) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-gnome.vcxproj libsoup2.4-2.54.1/build/win32/vs11/soup-gnome.vcxproj --- libsoup2.4-2.52.2/build/win32/vs11/soup-gnome.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-gnome.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C88A385-28C8-4B30-91A4-FBA381A5A46F} + soupgnome + Win32Proj + + + + DynamicLibrary + Unicode + v110 + true + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + v110 + true + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-gnome.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs11/soup-gnome.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs11/soup-gnome.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-gnome.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-install.props libsoup2.4-2.54.1/build/win32/vs11/soup-install.props --- libsoup2.4-2.52.2/build/win32/vs11/soup-install.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-install.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,91 @@ + + + + + + + +mkdir $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.pdb $(CopyDir)\bin +mkdir $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-$(ApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-gnome-$(ApiVersion).lib $(CopyDir)\lib +mkdir $(CopyDir)\include\libsoup-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup.h $(CopyDir)\include\libsoup-2.4\libsoup\soup.h +copy ..\..\..\libsoup\soup-address.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-address.h +copy ..\..\..\libsoup\soup-auth.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth.h +copy ..\..\..\libsoup\soup-auth-domain.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain.h +copy ..\..\..\libsoup\soup-auth-domain-basic.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-basic.h +copy ..\..\..\libsoup\soup-auth-domain-digest.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-digest.h +copy ..\..\..\libsoup\soup-auth-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-manager.h +copy ..\..\..\libsoup\soup-autocleanups.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-autocleanups.h +copy ..\..\..\libsoup\soup-cache.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cache.h +copy ..\..\..\libsoup\soup-content-decoder.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-decoder.h +copy ..\..\..\libsoup\soup-content-sniffer.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-sniffer.h +copy ..\..\..\libsoup\soup-cookie.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie.h +copy ..\..\..\libsoup\soup-cookie-jar.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar.h +copy ..\..\..\libsoup\soup-cookie-jar-db.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-db.h +copy ..\..\..\libsoup\soup-cookie-jar-text.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-text.h +copy ..\..\..\libsoup\soup-date.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-date.h +copy ..\..\..\libsoup\soup-form.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-form.h +copy ..\..\..\libsoup\soup-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-headers.h +copy ..\..\..\libsoup\soup-logger.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-logger.h +copy ..\..\..\libsoup\soup-message.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message.h +copy ..\..\..\libsoup\soup-message-body.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-body.h +copy ..\..\..\libsoup\soup-message-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-headers.h +copy ..\..\..\libsoup\soup-method.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-method.h +copy ..\..\..\libsoup\soup-misc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-misc.h +copy ..\..\..\libsoup\soup-multipart.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart.h +copy ..\..\..\libsoup\soup-multipart-input-stream.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart-input-stream.h +copy ..\..\..\libsoup\soup-password-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-password-manager.h +copy ..\..\..\libsoup\soup-portability.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-portability.h +copy ..\..\..\libsoup\soup-proxy-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver.h +copy ..\..\..\libsoup\soup-proxy-resolver-default.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver-default.h +copy ..\..\..\libsoup\soup-proxy-uri-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-uri-resolver.h +copy ..\..\..\libsoup\soup-request.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request.h +copy ..\..\..\libsoup\soup-request-data.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-data.h +copy ..\..\..\libsoup\soup-request-file.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-file.h +copy ..\..\..\libsoup\soup-request-http.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-http.h +copy ..\..\..\libsoup\soup-requester.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-requester.h +copy ..\..\..\libsoup\soup-server.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-server.h +copy ..\..\..\libsoup\soup-session.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session.h +copy ..\..\..\libsoup\soup-session-async.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-async.h +copy ..\..\..\libsoup\soup-session-feature.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-feature.h +copy ..\..\..\libsoup\soup-session-sync.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-sync.h +copy ..\..\..\libsoup\soup-socket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-socket.h +copy ..\..\..\libsoup\soup-status.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-status.h +copy ..\..\..\libsoup\soup-tld.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-tld.h +copy ..\..\..\libsoup\soup-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-types.h +copy ..\..\..\libsoup\soup-uri.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-uri.h +copy ..\..\..\libsoup\soup-value-utils.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-value-utils.h +copy ..\..\..\libsoup\soup-websocket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket.h +copy ..\..\..\libsoup\soup-websocket-connection.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket-connection.h +copy ..\..\..\libsoup\soup-xmlrpc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc.h +copy ..\..\..\libsoup\soup-xmlrpc-old.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc-old.h +copy ..\..\..\libsoup\soup-enum-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-enum-types.h +copy ..\..\..\libsoup\soup-version.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-version.h +mkdir $(CopyDir)\include\libsoup-gnome-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup-cookie-jar-sqlite.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-cookie-jar-sqlite.h +copy ..\..\..\libsoup\soup-gnome.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome.h +copy ..\..\..\libsoup\soup-gnome-features.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome-features.h + + + + <_PropertySheetDisplayName>pangoinstallprops + + + + + $(SoupDoInstall) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-install.vcxproj libsoup2.4-2.54.1/build/win32/vs11/soup-install.vcxproj --- libsoup2.4-2.52.2/build/win32/vs11/soup-install.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-install.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E0DCF460-914F-46F9-94D6-86D456CB53E9} + soupinstall + + + + Utility + MultiByte + v110 + true + + + Utility + MultiByte + v110 + + + Utility + MultiByte + v110 + true + + + Utility + MultiByte + v110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + + + + + {b24831c4-b8f2-41d6-aaf4-12192f71c623} + false + + + {80dc062e-2146-4ce8-a448-fd2205ab2ca4} + false + + + {3ad0cb92-ee38-425e-83cb-e7b1cb1d305e} + false + + + {8c88a385-28c8-4b30-91a4-fba381a5a46f} + false + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup.vcxproj libsoup2.4-2.54.1/build/win32/vs11/soup.vcxproj --- libsoup2.4-2.52.2/build/win32/vs11/soup.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,285 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D83A3162-B14C-459C-AF81-15BBFA90240D} + soup + Win32Proj + + + + DynamicLibrary + Unicode + v110 + true + + + DynamicLibrary + Unicode + v110 + + + DynamicLibrary + Unicode + v110 + true + + + DynamicLibrary + Unicode + v110 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + + + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs11/soup.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs11/soup.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,94 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + Resource Files + Resource Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs11/soup-version-paths.props libsoup2.4-2.54.1/build/win32/vs11/soup-version-paths.props --- libsoup2.4-2.52.2/build/win32/vs11/soup-version-paths.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs11/soup-version-paths.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + 11 + ..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + 2.4 + lib + -$(ApiVersion)-0 + + -$(ApiVersion)-vs$(VSVer) + $(SoupSeparateVSDllPrefix) + $(SoupSeparateVSDllSuffix) + c:\python27 + + + <_PropertySheetDisplayName>soupversionpathsprops + + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(ApiVersion) + + + $(SoupLibtoolCompatibleDllPrefix) + + + $(SoupLibtoolCompatibleDllSuffix) + + + $(SoupSeparateVSDllPrefix) + + + $(SoupSeparateVSDllSuffix) + + + $(SoupDllPrefix) + + + $(SoupDllSuffix) + + + $(PythonPath) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/get.vcxproj libsoup2.4-2.54.1/build/win32/vs12/get.vcxproj --- libsoup2.4-2.52.2/build/win32/vs12/get.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/get.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B24831C4-B8F2-41D6-AAF4-12192F71C623} + get + Win32Proj + + + + Application + Unicode + v120 + true + + + Application + Unicode + v120 + + + Application + Unicode + v120 + true + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/get.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs12/get.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs12/get.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/get.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/libsoup.sln libsoup2.4-2.54.1/build/win32/vs12/libsoup.sln --- libsoup2.4-2.52.2/build/win32/vs12/libsoup.sln 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/libsoup.sln 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,76 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup", "soup.vcxproj", "{D83A3162-B14C-459C-AF81-15BBFA90240D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-gnome", "soup-gnome.vcxproj", "{8C88A385-28C8-4B30-91A4-FBA381A5A46F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get", "get.vcxproj", "{B24831C4-B8F2-41D6-AAF4-12192F71C623}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-httpd", "simple-httpd.vcxproj", "{80DC062E-2146-4CE8-A448-FD2205AB2CA4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-proxy", "simple-proxy.vcxproj", "{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-install", "soup-install.vcxproj", "{E0DCF460-914F-46F9-94D6-86D456CB53E9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.Build.0 = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.ActiveCfg = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.Build.0 = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.ActiveCfg = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru libsoup2.4-2.52.2/build/win32/vs12/Makefile.am libsoup2.4-2.54.1/build/win32/vs12/Makefile.am --- libsoup2.4-2.52.2/build/win32/vs12/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,26 @@ +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + soup-install.vcxproj \ + get.vcxproj.filters \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +DISTCLEANFILES = $(EXTRA_DIST) + +MSVC_VER = 12 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 2013 + +include $(top_srcdir)/build/Makefile-newvs.am diff -Nru libsoup2.4-2.52.2/build/win32/vs12/Makefile.in libsoup2.4-2.54.1/build/win32/vs12/Makefile.in --- libsoup2.4-2.52.2/build/win32/vs12/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -0,0 +1,590 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32/vs12 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/Makefile-newvs.am +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APACHE_HTTPD = @APACHE_HTTPD@ +APACHE_MODULE_DIR = @APACHE_MODULE_DIR@ +APACHE_PHP_MODULE = @APACHE_PHP_MODULE@ +APACHE_PHP_MODULE_DIR = @APACHE_PHP_MODULE_DIR@ +APACHE_SSL_MODULE_DIR = @APACHE_SSL_MODULE_DIR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_GNOME = @HAVE_GNOME@ +HTML_DIR = @HTML_DIR@ +IF_HAVE_PHP = @IF_HAVE_PHP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHP = @PHP@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUP_AGE = @SOUP_AGE@ +SOUP_API_VERSION = @SOUP_API_VERSION@ +SOUP_CURRENT = @SOUP_CURRENT@ +SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ +SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ +SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ +SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ +SOUP_REVISION = @SOUP_REVISION@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VAPIDIR = @VAPIDIR@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XML_CFLAGS = @XML_CFLAGS@ +XML_LIBS = @XML_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ntlm_auth = @ntlm_auth@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + soup-install.vcxproj \ + get.vcxproj.filters \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +DISTCLEANFILES = $(EXTRA_DIST) +MSVC_VER = 12 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 2013 +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile-newvs.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs12/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/vs12/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/build/Makefile-newvs.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libsoup2.4-2.52.2/build/win32/vs12/simple-httpd.vcxproj libsoup2.4-2.54.1/build/win32/vs12/simple-httpd.vcxproj --- libsoup2.4-2.52.2/build/win32/vs12/simple-httpd.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/simple-httpd.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {80DC062E-2146-4CE8-A448-FD2205AB2CA4} + simplehttpd + Win32Proj + + + + Application + Unicode + v120 + true + + + Application + Unicode + v120 + + + Application + Unicode + v120 + true + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/simple-httpd.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs12/simple-httpd.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs12/simple-httpd.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/simple-httpd.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/simple-proxy.vcxproj libsoup2.4-2.54.1/build/win32/vs12/simple-proxy.vcxproj --- libsoup2.4-2.52.2/build/win32/vs12/simple-proxy.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/simple-proxy.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E} + simpleproxy + Win32Proj + + + + Application + Unicode + v120 + true + + + Application + Unicode + v120 + + + Application + Unicode + v120 + true + + + Application + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/simple-proxy.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs12/simple-proxy.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs12/simple-proxy.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/simple-proxy.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-build-defines.props libsoup2.4-2.54.1/build/win32/vs12/soup-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs12/soup-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-build-defines.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + <_PropertySheetDisplayName>soupbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + true + /d2Zi+ %(AdditionalOptions) + + + gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-dll-build-defines.props libsoup2.4-2.54.1/build/win32/vs12/soup-dll-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs12/soup-dll-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-dll-build-defines.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + + + LIBSOUP_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="libsoup" + libxml2.lib;sqlite3.lib;intl.lib;ws2_32.lib + + + <_PropertySheetDisplayName>soupdllbuilddefinesprops + + + + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).dll + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).pdb + $(OutDir)$(ProjectName)-$(ApiVersion).lib + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-gen-srcs.props libsoup2.4-2.54.1/build/win32/vs12/soup-gen-srcs.props --- libsoup2.4-2.52.2/build/win32/vs12/soup-gen-srcs.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-gen-srcs.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + copy ..\..\..\config.h.win32 ..\..\..\config.h + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.in --output=..\..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=2 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp1 --output=..\..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=53 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp2 --output=..\..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=2 + +del ..\..\..\libsoup\soup-version.h.tmp1 ..\..\..\libsoup\soup-version.h.tmp2 + + + $(PythonPath)\python.exe ..\..\..\libsoup\tld-parser.py ..\..\..\data\effective_tld_names.dat ..\..\..\libsoup\tld_data.inc + + + <_PropertySheetDisplayName>soupgensrcsprops + + + + + $(CopyConfigH) + + + $(GenSoupVersionH) + + + $(GenTldDataInc) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-gnome.vcxproj libsoup2.4-2.54.1/build/win32/vs12/soup-gnome.vcxproj --- libsoup2.4-2.52.2/build/win32/vs12/soup-gnome.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-gnome.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C88A385-28C8-4B30-91A4-FBA381A5A46F} + soupgnome + Win32Proj + + + + DynamicLibrary + Unicode + v120 + true + + + DynamicLibrary + Unicode + v120 + + + DynamicLibrary + Unicode + v120 + true + + + DynamicLibrary + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-gnome.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs12/soup-gnome.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs12/soup-gnome.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-gnome.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-install.props libsoup2.4-2.54.1/build/win32/vs12/soup-install.props --- libsoup2.4-2.52.2/build/win32/vs12/soup-install.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-install.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,91 @@ + + + + + + + +mkdir $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.pdb $(CopyDir)\bin +mkdir $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-$(ApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-gnome-$(ApiVersion).lib $(CopyDir)\lib +mkdir $(CopyDir)\include\libsoup-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup.h $(CopyDir)\include\libsoup-2.4\libsoup\soup.h +copy ..\..\..\libsoup\soup-address.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-address.h +copy ..\..\..\libsoup\soup-auth.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth.h +copy ..\..\..\libsoup\soup-auth-domain.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain.h +copy ..\..\..\libsoup\soup-auth-domain-basic.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-basic.h +copy ..\..\..\libsoup\soup-auth-domain-digest.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-digest.h +copy ..\..\..\libsoup\soup-auth-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-manager.h +copy ..\..\..\libsoup\soup-autocleanups.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-autocleanups.h +copy ..\..\..\libsoup\soup-cache.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cache.h +copy ..\..\..\libsoup\soup-content-decoder.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-decoder.h +copy ..\..\..\libsoup\soup-content-sniffer.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-sniffer.h +copy ..\..\..\libsoup\soup-cookie.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie.h +copy ..\..\..\libsoup\soup-cookie-jar.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar.h +copy ..\..\..\libsoup\soup-cookie-jar-db.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-db.h +copy ..\..\..\libsoup\soup-cookie-jar-text.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-text.h +copy ..\..\..\libsoup\soup-date.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-date.h +copy ..\..\..\libsoup\soup-form.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-form.h +copy ..\..\..\libsoup\soup-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-headers.h +copy ..\..\..\libsoup\soup-logger.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-logger.h +copy ..\..\..\libsoup\soup-message.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message.h +copy ..\..\..\libsoup\soup-message-body.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-body.h +copy ..\..\..\libsoup\soup-message-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-headers.h +copy ..\..\..\libsoup\soup-method.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-method.h +copy ..\..\..\libsoup\soup-misc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-misc.h +copy ..\..\..\libsoup\soup-multipart.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart.h +copy ..\..\..\libsoup\soup-multipart-input-stream.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart-input-stream.h +copy ..\..\..\libsoup\soup-password-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-password-manager.h +copy ..\..\..\libsoup\soup-portability.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-portability.h +copy ..\..\..\libsoup\soup-proxy-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver.h +copy ..\..\..\libsoup\soup-proxy-resolver-default.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver-default.h +copy ..\..\..\libsoup\soup-proxy-uri-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-uri-resolver.h +copy ..\..\..\libsoup\soup-request.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request.h +copy ..\..\..\libsoup\soup-request-data.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-data.h +copy ..\..\..\libsoup\soup-request-file.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-file.h +copy ..\..\..\libsoup\soup-request-http.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-http.h +copy ..\..\..\libsoup\soup-requester.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-requester.h +copy ..\..\..\libsoup\soup-server.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-server.h +copy ..\..\..\libsoup\soup-session.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session.h +copy ..\..\..\libsoup\soup-session-async.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-async.h +copy ..\..\..\libsoup\soup-session-feature.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-feature.h +copy ..\..\..\libsoup\soup-session-sync.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-sync.h +copy ..\..\..\libsoup\soup-socket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-socket.h +copy ..\..\..\libsoup\soup-status.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-status.h +copy ..\..\..\libsoup\soup-tld.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-tld.h +copy ..\..\..\libsoup\soup-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-types.h +copy ..\..\..\libsoup\soup-uri.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-uri.h +copy ..\..\..\libsoup\soup-value-utils.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-value-utils.h +copy ..\..\..\libsoup\soup-websocket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket.h +copy ..\..\..\libsoup\soup-websocket-connection.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket-connection.h +copy ..\..\..\libsoup\soup-xmlrpc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc.h +copy ..\..\..\libsoup\soup-xmlrpc-old.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc-old.h +copy ..\..\..\libsoup\soup-enum-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-enum-types.h +copy ..\..\..\libsoup\soup-version.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-version.h +mkdir $(CopyDir)\include\libsoup-gnome-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup-cookie-jar-sqlite.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-cookie-jar-sqlite.h +copy ..\..\..\libsoup\soup-gnome.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome.h +copy ..\..\..\libsoup\soup-gnome-features.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome-features.h + + + + <_PropertySheetDisplayName>pangoinstallprops + + + + + $(SoupDoInstall) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-install.vcxproj libsoup2.4-2.54.1/build/win32/vs12/soup-install.vcxproj --- libsoup2.4-2.52.2/build/win32/vs12/soup-install.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-install.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E0DCF460-914F-46F9-94D6-86D456CB53E9} + soupinstall + + + + Utility + MultiByte + v120 + true + + + Utility + MultiByte + v120 + + + Utility + MultiByte + v120 + true + + + Utility + MultiByte + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + + + + + {b24831c4-b8f2-41d6-aaf4-12192f71c623} + false + + + {80dc062e-2146-4ce8-a448-fd2205ab2ca4} + false + + + {3ad0cb92-ee38-425e-83cb-e7b1cb1d305e} + false + + + {8c88a385-28c8-4b30-91a4-fba381a5a46f} + false + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup.vcxproj libsoup2.4-2.54.1/build/win32/vs12/soup.vcxproj --- libsoup2.4-2.52.2/build/win32/vs12/soup.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,285 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D83A3162-B14C-459C-AF81-15BBFA90240D} + soup + Win32Proj + + + + DynamicLibrary + Unicode + v120 + true + + + DynamicLibrary + Unicode + v120 + + + DynamicLibrary + Unicode + v120 + true + + + DynamicLibrary + Unicode + v120 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + + + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs12/soup.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs12/soup.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,94 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + Resource Files + Resource Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs12/soup-version-paths.props libsoup2.4-2.54.1/build/win32/vs12/soup-version-paths.props --- libsoup2.4-2.52.2/build/win32/vs12/soup-version-paths.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs12/soup-version-paths.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + 12 + ..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + 2.4 + lib + -$(ApiVersion)-0 + + -$(ApiVersion)-vs$(VSVer) + $(SoupSeparateVSDllPrefix) + $(SoupSeparateVSDllSuffix) + c:\python27 + + + <_PropertySheetDisplayName>soupversionpathsprops + + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(ApiVersion) + + + $(SoupLibtoolCompatibleDllPrefix) + + + $(SoupLibtoolCompatibleDllSuffix) + + + $(SoupSeparateVSDllPrefix) + + + $(SoupSeparateVSDllSuffix) + + + $(SoupDllPrefix) + + + $(SoupDllSuffix) + + + $(PythonPath) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/get.vcxproj libsoup2.4-2.54.1/build/win32/vs14/get.vcxproj --- libsoup2.4-2.52.2/build/win32/vs14/get.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/get.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B24831C4-B8F2-41D6-AAF4-12192F71C623} + get + Win32Proj + + + + Application + Unicode + v140 + true + + + Application + Unicode + v140 + + + Application + Unicode + v140 + true + + + Application + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/get.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs14/get.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs14/get.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/get.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/libsoup.sln libsoup2.4-2.54.1/build/win32/vs14/libsoup.sln --- libsoup2.4-2.52.2/build/win32/vs14/libsoup.sln 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/libsoup.sln 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,76 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup", "soup.vcxproj", "{D83A3162-B14C-459C-AF81-15BBFA90240D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-gnome", "soup-gnome.vcxproj", "{8C88A385-28C8-4B30-91A4-FBA381A5A46F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get", "get.vcxproj", "{B24831C4-B8F2-41D6-AAF4-12192F71C623}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-httpd", "simple-httpd.vcxproj", "{80DC062E-2146-4CE8-A448-FD2205AB2CA4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-proxy", "simple-proxy.vcxproj", "{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-install", "soup-install.vcxproj", "{E0DCF460-914F-46F9-94D6-86D456CB53E9}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.Build.0 = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.ActiveCfg = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.Build.0 = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.ActiveCfg = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru libsoup2.4-2.52.2/build/win32/vs14/Makefile.am libsoup2.4-2.54.1/build/win32/vs14/Makefile.am --- libsoup2.4-2.52.2/build/win32/vs14/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,26 @@ +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + get.vcxproj.filters \ + soup-install.vcxproj \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +DISTCLEANFILES = $(EXTRA_DIST) + +MSVC_VER = 14 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 14 + +include $(top_srcdir)/build/Makefile-newvs.am diff -Nru libsoup2.4-2.52.2/build/win32/vs14/Makefile.in libsoup2.4-2.54.1/build/win32/vs14/Makefile.in --- libsoup2.4-2.52.2/build/win32/vs14/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -0,0 +1,590 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# Centralized autotools file +# Create the Visual Studio 2012/2013/2015 project files +# from the Visual Studio 2010 project files + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# Author: Fan, Chun-wei +# November 05, 2012 + +# MSVC_VER_LONG: Long Version of Visual Studio (2012, 2013, 14 and so on) +# MSVC_VER: Short Version of Visual Studio (11 for 2012, 12 for 2013, 14 for 2015 and so on) +# MSVC_FORMAT_VER: Use 12 for MSVC 2012 through 2015 +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32/vs14 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build/Makefile-newvs.am +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APACHE_HTTPD = @APACHE_HTTPD@ +APACHE_MODULE_DIR = @APACHE_MODULE_DIR@ +APACHE_PHP_MODULE = @APACHE_PHP_MODULE@ +APACHE_PHP_MODULE_DIR = @APACHE_PHP_MODULE_DIR@ +APACHE_SSL_MODULE_DIR = @APACHE_SSL_MODULE_DIR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_GNOME = @HAVE_GNOME@ +HTML_DIR = @HTML_DIR@ +IF_HAVE_PHP = @IF_HAVE_PHP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHP = @PHP@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUP_AGE = @SOUP_AGE@ +SOUP_API_VERSION = @SOUP_API_VERSION@ +SOUP_CURRENT = @SOUP_CURRENT@ +SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ +SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ +SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ +SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ +SOUP_REVISION = @SOUP_REVISION@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VAPIDIR = @VAPIDIR@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XML_CFLAGS = @XML_CFLAGS@ +XML_LIBS = @XML_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ntlm_auth = @ntlm_auth@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +EXTRA_DIST = \ + libsoup.sln \ + get.vcxproj \ + simple-httpd.vcxproj \ + simple-proxy.vcxproj \ + get.vcxproj.filters \ + soup-install.vcxproj \ + simple-httpd.vcxproj.filters \ + simple-proxy.vcxproj.filters \ + soup-build-defines.props \ + soup-dll-build-defines.props \ + soup-gen-srcs.props \ + soup-version-paths.props \ + soup.vcxproj \ + soup-gnome.vcxproj \ + soup.vcxproj.filters \ + soup-gnome.vcxproj.filters \ + soup-install.props + +DISTCLEANFILES = $(EXTRA_DIST) +MSVC_VER = 14 +MSVC_FORMAT_VER = 12 +MSVC_VER_LONG = 14 +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile-newvs.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs14/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/vs14/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; +$(top_srcdir)/build/Makefile-newvs.am $(am__empty): + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +%.sln: + sed 's/11\.00/$(MSVC_FORMAT_VER)\.00/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/2010/$(MSVC_VER_LONG)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.txt: + sed 's/vs10/vs$(MSVC_VER)/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + sed 's/VS10/VS$(MSVC_VER)/g' < $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@ + rm $(top_builddir)/build/win32/vs$(MSVC_VER)/$@.tmp + +%.vcxproj: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/v100/v$(MSVC_VER)0/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.props: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_srcdir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + sed 's/10<\/VSVer>/$(MSVC_VER)<\/VSVer>/g' < $(top_builddir)/build/win32/vs10/$@ > $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +%.vcxproj.filters: + if test -e $(top_srcdir)/build/win32/vs10/$@; then \ + cp $(top_srcdir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + else \ + cp $(top_builddir)/build/win32/vs10/$@ $(top_builddir)/build/win32/vs$(MSVC_VER)/$@; \ + fi + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libsoup2.4-2.52.2/build/win32/vs14/simple-httpd.vcxproj libsoup2.4-2.54.1/build/win32/vs14/simple-httpd.vcxproj --- libsoup2.4-2.52.2/build/win32/vs14/simple-httpd.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/simple-httpd.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {80DC062E-2146-4CE8-A448-FD2205AB2CA4} + simplehttpd + Win32Proj + + + + Application + Unicode + v140 + true + + + Application + Unicode + v140 + + + Application + Unicode + v140 + true + + + Application + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/simple-httpd.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs14/simple-httpd.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs14/simple-httpd.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/simple-httpd.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/simple-proxy.vcxproj libsoup2.4-2.54.1/build/win32/vs14/simple-proxy.vcxproj --- libsoup2.4-2.52.2/build/win32/vs14/simple-proxy.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/simple-proxy.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E} + simpleproxy + Win32Proj + + + + Application + Unicode + v140 + true + + + Application + Unicode + v140 + + + Application + Unicode + v140 + true + + + Application + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/simple-proxy.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs14/simple-proxy.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs14/simple-proxy.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/simple-proxy.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Sources + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-build-defines.props libsoup2.4-2.54.1/build/win32/vs14/soup-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs14/soup-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-build-defines.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + + + <_PropertySheetDisplayName>soupbuilddefinesprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\libxml2;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + true + /d2Zi+ %(AdditionalOptions) + + + gio-2.0.lib;gobject-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-dll-build-defines.props libsoup2.4-2.54.1/build/win32/vs14/soup-dll-build-defines.props --- libsoup2.4-2.52.2/build/win32/vs14/soup-dll-build-defines.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-dll-build-defines.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + + + LIBSOUP_COMPILATION;DLL_EXPORT;G_LOG_DOMAIN="libsoup" + libxml2.lib;sqlite3.lib;intl.lib;ws2_32.lib + + + <_PropertySheetDisplayName>soupdllbuilddefinesprops + + + + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).dll + $(OutDir)$(SoupDllPrefix)$(ProjectName)$(SoupDllSuffix).pdb + $(OutDir)$(ProjectName)-$(ApiVersion).lib + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-gen-srcs.props libsoup2.4-2.54.1/build/win32/vs14/soup-gen-srcs.props --- libsoup2.4-2.52.2/build/win32/vs14/soup-gen-srcs.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-gen-srcs.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,35 @@ + + + + + + + copy ..\..\..\config.h.win32 ..\..\..\config.h + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.in --output=..\..\..\libsoup\soup-version.h.tmp1 --var=SOUP_MAJOR_VERSION --outstring=2 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp1 --output=..\..\..\libsoup\soup-version.h.tmp2 --var=SOUP_MINOR_VERSION --outstring=53 + +$(PythonPath)\python.exe ..\replace.py --action=replace-var --input=..\..\..\libsoup\soup-version.h.tmp2 --output=..\..\..\libsoup\soup-version.h --var=SOUP_MICRO_VERSION --outstring=2 + +del ..\..\..\libsoup\soup-version.h.tmp1 ..\..\..\libsoup\soup-version.h.tmp2 + + + $(PythonPath)\python.exe ..\..\..\libsoup\tld-parser.py ..\..\..\data\effective_tld_names.dat ..\..\..\libsoup\tld_data.inc + + + <_PropertySheetDisplayName>soupgensrcsprops + + + + + $(CopyConfigH) + + + $(GenSoupVersionH) + + + $(GenTldDataInc) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-gnome.vcxproj libsoup2.4-2.54.1/build/win32/vs14/soup-gnome.vcxproj --- libsoup2.4-2.52.2/build/win32/vs14/soup-gnome.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-gnome.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8C88A385-28C8-4B30-91A4-FBA381A5A46F} + soupgnome + Win32Proj + + + + DynamicLibrary + Unicode + v140 + true + + + DynamicLibrary + Unicode + v140 + + + DynamicLibrary + Unicode + v140 + true + + + DynamicLibrary + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + true + Windows + true + true + MachineX64 + + + + + + + + + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-gnome.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs14/soup-gnome.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs14/soup-gnome.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-gnome.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-install.props libsoup2.4-2.54.1/build/win32/vs14/soup-install.props --- libsoup2.4-2.52.2/build/win32/vs14/soup-install.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-install.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,91 @@ + + + + + + + +mkdir $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).dll $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\$(SoupDllPrefix)soup-gnome$(SoupDllSuffix).pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\get.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-httpd.pdb $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.exe $(CopyDir)\bin +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\simple-proxy.pdb $(CopyDir)\bin +mkdir $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-$(ApiVersion).lib $(CopyDir)\lib +copy $(SolutionDir)\$(Configuration)\$(Platform)\bin\soup-gnome-$(ApiVersion).lib $(CopyDir)\lib +mkdir $(CopyDir)\include\libsoup-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup.h $(CopyDir)\include\libsoup-2.4\libsoup\soup.h +copy ..\..\..\libsoup\soup-address.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-address.h +copy ..\..\..\libsoup\soup-auth.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth.h +copy ..\..\..\libsoup\soup-auth-domain.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain.h +copy ..\..\..\libsoup\soup-auth-domain-basic.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-basic.h +copy ..\..\..\libsoup\soup-auth-domain-digest.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-domain-digest.h +copy ..\..\..\libsoup\soup-auth-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-auth-manager.h +copy ..\..\..\libsoup\soup-autocleanups.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-autocleanups.h +copy ..\..\..\libsoup\soup-cache.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cache.h +copy ..\..\..\libsoup\soup-content-decoder.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-decoder.h +copy ..\..\..\libsoup\soup-content-sniffer.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-content-sniffer.h +copy ..\..\..\libsoup\soup-cookie.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie.h +copy ..\..\..\libsoup\soup-cookie-jar.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar.h +copy ..\..\..\libsoup\soup-cookie-jar-db.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-db.h +copy ..\..\..\libsoup\soup-cookie-jar-text.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-cookie-jar-text.h +copy ..\..\..\libsoup\soup-date.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-date.h +copy ..\..\..\libsoup\soup-form.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-form.h +copy ..\..\..\libsoup\soup-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-headers.h +copy ..\..\..\libsoup\soup-logger.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-logger.h +copy ..\..\..\libsoup\soup-message.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message.h +copy ..\..\..\libsoup\soup-message-body.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-body.h +copy ..\..\..\libsoup\soup-message-headers.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-message-headers.h +copy ..\..\..\libsoup\soup-method.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-method.h +copy ..\..\..\libsoup\soup-misc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-misc.h +copy ..\..\..\libsoup\soup-multipart.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart.h +copy ..\..\..\libsoup\soup-multipart-input-stream.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-multipart-input-stream.h +copy ..\..\..\libsoup\soup-password-manager.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-password-manager.h +copy ..\..\..\libsoup\soup-portability.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-portability.h +copy ..\..\..\libsoup\soup-proxy-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver.h +copy ..\..\..\libsoup\soup-proxy-resolver-default.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-resolver-default.h +copy ..\..\..\libsoup\soup-proxy-uri-resolver.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-proxy-uri-resolver.h +copy ..\..\..\libsoup\soup-request.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request.h +copy ..\..\..\libsoup\soup-request-data.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-data.h +copy ..\..\..\libsoup\soup-request-file.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-file.h +copy ..\..\..\libsoup\soup-request-http.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-request-http.h +copy ..\..\..\libsoup\soup-requester.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-requester.h +copy ..\..\..\libsoup\soup-server.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-server.h +copy ..\..\..\libsoup\soup-session.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session.h +copy ..\..\..\libsoup\soup-session-async.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-async.h +copy ..\..\..\libsoup\soup-session-feature.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-feature.h +copy ..\..\..\libsoup\soup-session-sync.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-session-sync.h +copy ..\..\..\libsoup\soup-socket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-socket.h +copy ..\..\..\libsoup\soup-status.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-status.h +copy ..\..\..\libsoup\soup-tld.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-tld.h +copy ..\..\..\libsoup\soup-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-types.h +copy ..\..\..\libsoup\soup-uri.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-uri.h +copy ..\..\..\libsoup\soup-value-utils.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-value-utils.h +copy ..\..\..\libsoup\soup-websocket.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket.h +copy ..\..\..\libsoup\soup-websocket-connection.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-websocket-connection.h +copy ..\..\..\libsoup\soup-xmlrpc.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc.h +copy ..\..\..\libsoup\soup-xmlrpc-old.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-xmlrpc-old.h +copy ..\..\..\libsoup\soup-enum-types.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-enum-types.h +copy ..\..\..\libsoup\soup-version.h $(CopyDir)\include\libsoup-2.4\libsoup\soup-version.h +mkdir $(CopyDir)\include\libsoup-gnome-$(ApiVersion)\libsoup +copy ..\..\..\libsoup\soup-cookie-jar-sqlite.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-cookie-jar-sqlite.h +copy ..\..\..\libsoup\soup-gnome.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome.h +copy ..\..\..\libsoup\soup-gnome-features.h $(CopyDir)\include\libsoup-gnome-2.4\libsoup\soup-gnome-features.h + + + + <_PropertySheetDisplayName>pangoinstallprops + + + + + $(SoupDoInstall) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-install.vcxproj libsoup2.4-2.54.1/build/win32/vs14/soup-install.vcxproj --- libsoup2.4-2.52.2/build/win32/vs14/soup-install.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-install.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,117 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E0DCF460-914F-46F9-94D6-86D456CB53E9} + soupinstall + + + + Utility + MultiByte + v140 + true + + + Utility + MultiByte + v140 + + + Utility + MultiByte + v140 + true + + + Utility + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + Copying build results... + $(SoupDoInstall) + some_file;%(Outputs) + + + + + {b24831c4-b8f2-41d6-aaf4-12192f71c623} + false + + + {80dc062e-2146-4ce8-a448-fd2205ab2ca4} + false + + + {3ad0cb92-ee38-425e-83cb-e7b1cb1d305e} + false + + + {8c88a385-28c8-4b30-91a4-fba381a5a46f} + false + + + {d83a3162-b14c-459c-af81-15bbfa90240d} + false + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup.vcxproj libsoup2.4-2.54.1/build/win32/vs14/soup.vcxproj --- libsoup2.4-2.52.2/build/win32/vs14/soup.vcxproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup.vcxproj 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,285 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {D83A3162-B14C-459C-AF81-15BBFA90240D} + soup + Win32Proj + + + + DynamicLibrary + Unicode + v140 + true + + + DynamicLibrary + Unicode + v140 + + + DynamicLibrary + Unicode + v140 + true + + + DynamicLibrary + Unicode + v140 + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + true + + + false + + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + EditAndContinue + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX86 + + + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;$(SoupBuildDefines);%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + $(SoupBuildDefines);%(PreprocessorDefinitions) + MultiThreadedDLL + true + + Level3 + ProgramDatabase + + + $(SoupExtraDepLibs);%(AdditionalDependencies) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + Copying config.h from config.h.win32... + $(CopyConfigH) + ..\..\..\config.h;%(Outputs) + + + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + Generating tld_data.inc... + $(GenTldDataInc) + ..\..\..\libsoup\tld_data.inc;%(Outputs) + + + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + Generating soup-version.h... + $(GenSoupVersionH) + ..\..\..\libsoup\soup-version.h;%(Outputs) + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup.vcxproj.filters libsoup2.4-2.54.1/build/win32/vs14/soup.vcxproj.filters --- libsoup2.4-2.52.2/build/win32/vs14/soup.vcxproj.filters 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup.vcxproj.filters 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,94 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + Source Files + + + Resource Files + Resource Files + Resource Files + + diff -Nru libsoup2.4-2.52.2/build/win32/vs14/soup-version-paths.props libsoup2.4-2.54.1/build/win32/vs14/soup-version-paths.props --- libsoup2.4-2.52.2/build/win32/vs14/soup-version-paths.props 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs14/soup-version-paths.props 2016-01-09 15:00:03.000000000 +0000 @@ -0,0 +1,57 @@ + + + + + + 14 + ..\..\..\..\vs$(VSVer)\$(Platform) + $(GlibEtcInstallRoot) + 2.4 + lib + -$(ApiVersion)-0 + + -$(ApiVersion)-vs$(VSVer) + $(SoupSeparateVSDllPrefix) + $(SoupSeparateVSDllSuffix) + c:\python27 + + + <_PropertySheetDisplayName>soupversionpathsprops + + + + + $(VSVer) + + + $(GlibEtcInstallRoot) + + + $(CopyDir) + + + $(ApiVersion) + + + $(SoupLibtoolCompatibleDllPrefix) + + + $(SoupLibtoolCompatibleDllSuffix) + + + $(SoupSeparateVSDllPrefix) + + + $(SoupSeparateVSDllSuffix) + + + $(SoupDllPrefix) + + + $(SoupDllSuffix) + + + $(PythonPath) + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/get.vcproj libsoup2.4-2.54.1/build/win32/vs9/get.vcproj --- libsoup2.4-2.52.2/build/win32/vs9/get.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/get.vcproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/libsoup.sln libsoup2.4-2.54.1/build/win32/vs9/libsoup.sln --- libsoup2.4-2.52.2/build/win32/vs9/libsoup.sln 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/libsoup.sln 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,147 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup", "soup.vcproj", "{D83A3162-B14C-459C-AF81-15BBFA90240D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-gnome", "soup-gnome.vcproj", "{8C88A385-28C8-4B30-91A4-FBA381A5A46F}" + ProjectSection(ProjectDependencies) = postProject + {D83A3162-B14C-459C-AF81-15BBFA90240D} = {D83A3162-B14C-459C-AF81-15BBFA90240D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "get", "get.vcproj", "{B24831C4-B8F2-41D6-AAF4-12192F71C623}" + ProjectSection(ProjectDependencies) = postProject + {D83A3162-B14C-459C-AF81-15BBFA90240D} = {D83A3162-B14C-459C-AF81-15BBFA90240D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-httpd", "simple-httpd.vcproj", "{80DC062E-2146-4CE8-A448-FD2205AB2CA4}" + ProjectSection(ProjectDependencies) = postProject + {D83A3162-B14C-459C-AF81-15BBFA90240D} = {D83A3162-B14C-459C-AF81-15BBFA90240D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simple-proxy", "simple-proxy.vcproj", "{3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}" + ProjectSection(ProjectDependencies) = postProject + {D83A3162-B14C-459C-AF81-15BBFA90240D} = {D83A3162-B14C-459C-AF81-15BBFA90240D} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "soup-install", "soup-install.vcproj", "{E0DCF460-914F-46F9-94D6-86D456CB53E9}" + ProjectSection(ProjectDependencies) = postProject + {80DC062E-2146-4CE8-A448-FD2205AB2CA4} = {80DC062E-2146-4CE8-A448-FD2205AB2CA4} + {D83A3162-B14C-459C-AF81-15BBFA90240D} = {D83A3162-B14C-459C-AF81-15BBFA90240D} + {8C88A385-28C8-4B30-91A4-FBA381A5A46F} = {8C88A385-28C8-4B30-91A4-FBA381A5A46F} + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E} = {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E} + {B24831C4-B8F2-41D6-AAF4-12192F71C623} = {B24831C4-B8F2-41D6-AAF4-12192F71C623} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + Debug_MIT_GSSAPI|Win32 = Debug_MIT_GSSAPI|Win32 + Debug_MIT_GSSAPI|x64 = Debug_MIT_GSSAPI|x64 + Release_MIT_GSSAPI|Win32 = Release_MIT_GSSAPI|Win32 + Release_MIT_GSSAPI|x64 = Release_MIT_GSSAPI|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.ActiveCfg = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|Win32.Build.0 = Debug|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.ActiveCfg = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug|x64.Build.0 = Debug|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.ActiveCfg = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|Win32.Build.0 = Release|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.ActiveCfg = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release|x64.Build.0 = Release|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug_MIT_GSSAPI|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Debug_MIT_GSSAPI|x64.Build.0 = Debug_MIT_GSSAPI|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|Win32.Build.0 = Release_MIT_GSSAPI|Win32 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.ActiveCfg = Release_MIT_GSSAPI|x64 + {D83A3162-B14C-459C-AF81-15BBFA90240D}.Release_MIT_GSSAPI|x64.Build.0 = Release_MIT_GSSAPI|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release|x64.Build.0 = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {8C88A385-28C8-4B30-91A4-FBA381A5A46F}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release|x64.Build.0 = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {B24831C4-B8F2-41D6-AAF4-12192F71C623}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release|x64.Build.0 = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {80DC062E-2146-4CE8-A448-FD2205AB2CA4}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release|x64.Build.0 = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {3AD0CB92-EE38-425E-83CB-E7B1CB1D305E}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release|x64.Build.0 = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.ActiveCfg = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|Win32.Build.0 = Debug|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.ActiveCfg = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Debug_MIT_GSSAPI|x64.Build.0 = Debug|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.ActiveCfg = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|Win32.Build.0 = Release|Win32 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.ActiveCfg = Release|x64 + {E0DCF460-914F-46F9-94D6-86D456CB53E9}.Release_MIT_GSSAPI|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff -Nru libsoup2.4-2.52.2/build/win32/vs9/Makefile.am libsoup2.4-2.54.1/build/win32/vs9/Makefile.am --- libsoup2.4-2.52.2/build/win32/vs9/Makefile.am 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,27 @@ +GENERATED_ITEMS = \ + soup.vcproj \ + soup-gnome.vcproj \ + soup-install.vsprops + +MSVC_HEADERS_LIST = soup.headers soup-gnome.headers + +EXTRA_DIST = \ + libsoup.sln \ + get.vcproj \ + simple-httpd.vcproj \ + simple-proxy.vcproj \ + soup-install.vcproj \ + soup-build-defines.vsprops \ + soup-dll-build-defines.vsprops \ + soup-gen-srcs.vsprops \ + soup-version-paths.vsprops \ + soup.vcprojin \ + soup-gnome.vcprojin \ + soup-install.vspropsin \ + $(GENERATED_ITEMS) + +soup-install.vsprops: $(top_srcdir)/build/win32/vs9/soup-install.vspropsin $(MSVC_HEADERS_LIST) + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/soup-install.vspropsin >$@ + rm $(MSVC_HEADERS_LIST) + +DISTCLEANFILES = $(GENERATED_ITEMS) diff -Nru libsoup2.4-2.52.2/build/win32/vs9/Makefile.in libsoup2.4-2.54.1/build/win32/vs9/Makefile.in --- libsoup2.4-2.52.2/build/win32/vs9/Makefile.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -0,0 +1,548 @@ +# Makefile.in generated by automake 1.15 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994-2014 Free Software Foundation, Inc. + +# This Makefile.in 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. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) +pkgdatadir = $(datadir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = build/win32/vs9 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ + $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ + $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/introspection.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/vapigen.m4 \ + $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) +mkinstalldirs = $(install_sh) -d +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = soup-gen-srcs.vsprops +CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = +SOURCES = +DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/soup-gen-srcs.vsprops.in +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALL_LINGUAS = @ALL_LINGUAS@ +AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ +APACHE_HTTPD = @APACHE_HTTPD@ +APACHE_MODULE_DIR = @APACHE_MODULE_DIR@ +APACHE_PHP_MODULE = @APACHE_PHP_MODULE@ +APACHE_PHP_MODULE_DIR = @APACHE_PHP_MODULE_DIR@ +APACHE_SSL_MODULE_DIR = @APACHE_SSL_MODULE_DIR@ +AR = @AR@ +AS = @AS@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@ +CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@ +CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CURL = @CURL@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ +DUMPBIN = @DUMPBIN@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +FGREP = @FGREP@ +GENHTML = @GENHTML@ +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MAKEFILE = @GLIB_MAKEFILE@ +GLIB_MKENUMS = @GLIB_MKENUMS@ +GMSGFMT = @GMSGFMT@ +GOBJECT_QUERY = @GOBJECT_QUERY@ +GREP = @GREP@ +GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_CHECK_PATH = @GTKDOC_CHECK_PATH@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ +GTKDOC_MKPDF = @GTKDOC_MKPDF@ +GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_GNOME = @HAVE_GNOME@ +HTML_DIR = @HTML_DIR@ +IF_HAVE_PHP = @IF_HAVE_PHP@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = @INTLTOOL_MERGE@ +INTLTOOL_PERL = @INTLTOOL_PERL@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ +INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@ +INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@ +INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@ +INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@ +INTROSPECTION_LIBS = @INTROSPECTION_LIBS@ +INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ +INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ +INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ +LCOV = @LCOV@ +LD = @LD@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LIPO = @LIPO@ +LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ +MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ +MKDIR_P = @MKDIR_P@ +MSGFMT = @MSGFMT@ +MSGMERGE = @MSGMERGE@ +NM = @NM@ +NMEDIT = @NMEDIT@ +OBJDUMP = @OBJDUMP@ +OBJEXT = @OBJEXT@ +OTOOL = @OTOOL@ +OTOOL64 = @OTOOL64@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PHP = @PHP@ +PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ +RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SOUP_AGE = @SOUP_AGE@ +SOUP_API_VERSION = @SOUP_API_VERSION@ +SOUP_CURRENT = @SOUP_CURRENT@ +SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ +SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ +SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ +SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ +SOUP_REVISION = @SOUP_REVISION@ +SQLITE_CFLAGS = @SQLITE_CFLAGS@ +SQLITE_LIBS = @SQLITE_LIBS@ +STRIP = @STRIP@ +USE_NLS = @USE_NLS@ +VALAC = @VALAC@ +VAPIDIR = @VAPIDIR@ +VAPIGEN = @VAPIGEN@ +VAPIGEN_MAKEFILE = @VAPIGEN_MAKEFILE@ +VAPIGEN_VAPIDIR = @VAPIGEN_VAPIDIR@ +VERSION = @VERSION@ +XGETTEXT = @XGETTEXT@ +XML_CFLAGS = @XML_CFLAGS@ +XML_LIBS = @XML_LIBS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +installed_test_metadir = @installed_test_metadir@ +installed_testdir = @installed_testdir@ +intltool__v_merge_options_ = @intltool__v_merge_options_@ +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +ntlm_auth = @ntlm_auth@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +GENERATED_ITEMS = \ + soup.vcproj \ + soup-gnome.vcproj \ + soup-install.vsprops + +MSVC_HEADERS_LIST = soup.headers soup-gnome.headers +EXTRA_DIST = \ + libsoup.sln \ + get.vcproj \ + simple-httpd.vcproj \ + simple-proxy.vcproj \ + soup-install.vcproj \ + soup-build-defines.vsprops \ + soup-dll-build-defines.vsprops \ + soup-gen-srcs.vsprops \ + soup-version-paths.vsprops \ + soup.vcprojin \ + soup-gnome.vcprojin \ + soup-install.vspropsin \ + $(GENERATED_ITEMS) + +DISTCLEANFILES = $(GENERATED_ITEMS) +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ + && { if test -f $@; then exit 0; else break; fi; }; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign build/win32/vs9/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --foreign build/win32/vs9/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): +soup-gen-srcs.vsprops: $(top_builddir)/config.status $(srcdir)/soup-gen-srcs.vsprops.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ + else \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic clean-libtool mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +html-am: + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-dvi-am: + +install-exec-am: + +install-html: install-html-am + +install-html-am: + +install-info: install-info-am + +install-info-am: + +install-man: + +install-pdf: install-pdf-am + +install-pdf-am: + +install-ps: install-ps-am + +install-ps-am: + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am + +.PRECIOUS: Makefile + + +soup-install.vsprops: $(top_srcdir)/build/win32/vs9/soup-install.vspropsin $(MSVC_HEADERS_LIST) + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/soup-install.vspropsin >$@ + rm $(MSVC_HEADERS_LIST) + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Nru libsoup2.4-2.52.2/build/win32/vs9/simple-httpd.vcproj libsoup2.4-2.54.1/build/win32/vs9/simple-httpd.vcproj --- libsoup2.4-2.52.2/build/win32/vs9/simple-httpd.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/simple-httpd.vcproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/simple-proxy.vcproj libsoup2.4-2.54.1/build/win32/vs9/simple-proxy.vcproj --- libsoup2.4-2.52.2/build/win32/vs9/simple-proxy.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/simple-proxy.vcproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-build-defines.vsprops libsoup2.4-2.54.1/build/win32/vs9/soup-build-defines.vsprops --- libsoup2.4-2.52.2/build/win32/vs9/soup-build-defines.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-build-defines.vsprops 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,22 @@ + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-dll-build-defines.vsprops libsoup2.4-2.54.1/build/win32/vs9/soup-dll-build-defines.vsprops --- libsoup2.4-2.52.2/build/win32/vs9/soup-dll-build-defines.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-dll-build-defines.vsprops 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,38 @@ + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-gen-srcs.vsprops libsoup2.4-2.54.1/build/win32/vs9/soup-gen-srcs.vsprops --- libsoup2.4-2.52.2/build/win32/vs9/soup-gen-srcs.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-gen-srcs.vsprops 2016-04-26 12:36:14.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-gen-srcs.vsprops.in libsoup2.4-2.54.1/build/win32/vs9/soup-gen-srcs.vsprops.in --- libsoup2.4-2.52.2/build/win32/vs9/soup-gen-srcs.vsprops.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-gen-srcs.vsprops.in 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,25 @@ + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-gnome.vcproj libsoup2.4-2.54.1/build/win32/vs9/soup-gnome.vcproj --- libsoup2.4-2.52.2/build/win32/vs9/soup-gnome.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-gnome.vcproj 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-gnome.vcprojin libsoup2.4-2.54.1/build/win32/vs9/soup-gnome.vcprojin --- libsoup2.4-2.52.2/build/win32/vs9/soup-gnome.vcprojin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-gnome.vcprojin 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "soup-gnome.sourcefiles" + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-install.vcproj libsoup2.4-2.54.1/build/win32/vs9/soup-install.vcproj --- libsoup2.4-2.52.2/build/win32/vs9/soup-install.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-install.vcproj 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-install.vsprops libsoup2.4-2.54.1/build/win32/vs9/soup-install.vsprops --- libsoup2.4-2.52.2/build/win32/vs9/soup-install.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-install.vsprops 2016-04-26 12:36:43.000000000 +0000 @@ -0,0 +1,85 @@ + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-install.vspropsin libsoup2.4-2.54.1/build/win32/vs9/soup-install.vspropsin --- libsoup2.4-2.52.2/build/win32/vs9/soup-install.vspropsin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-install.vspropsin 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,34 @@ + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup.vcproj libsoup2.4-2.54.1/build/win32/vs9/soup.vcproj --- libsoup2.4-2.52.2/build/win32/vs9/soup.vcproj 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup.vcproj 2016-01-09 14:59:48.000000000 +0000 @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup.vcprojin libsoup2.4-2.54.1/build/win32/vs9/soup.vcprojin --- libsoup2.4-2.52.2/build/win32/vs9/soup.vcprojin 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup.vcprojin 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "soup.sourcefiles" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build/win32/vs9/soup-version-paths.vsprops libsoup2.4-2.54.1/build/win32/vs9/soup-version-paths.vsprops --- libsoup2.4-2.52.2/build/win32/vs9/soup-version-paths.vsprops 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/build/win32/vs9/soup-version-paths.vsprops 2016-03-13 15:24:36.000000000 +0000 @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/build-aux/compile libsoup2.4-2.54.1/build-aux/compile --- libsoup2.4-2.52.2/build-aux/compile 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/compile 2016-04-26 12:36:12.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru libsoup2.4-2.52.2/build-aux/config.guess libsoup2.4-2.54.1/build-aux/config.guess --- libsoup2.4-2.52.2/build-aux/config.guess 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/config.guess 2016-04-26 12:36:12.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-03-23' +timestamp='2015-01-01' # 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 @@ -24,12 +24,12 @@ # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # -# Originally written by Per Bothner. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD # -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . me=`echo "$0" | sed -e 's,.*/,,'` @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -579,8 +579,9 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if [ -x /usr/bin/lslpp ] ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi diff -Nru libsoup2.4-2.52.2/build-aux/config.sub libsoup2.4-2.54.1/build-aux/config.sub --- libsoup2.4-2.52.2/build-aux/config.sub 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/config.sub 2016-04-26 12:36:12.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-07-28' +timestamp='2015-01-01' # 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 @@ -25,7 +25,7 @@ # of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches with a ChangeLog entry to config-patches@gnu.org. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -260,7 +260,7 @@ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ - | fido | fr30 | frv \ + | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia64 \ @@ -302,6 +302,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ + | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ @@ -312,6 +313,7 @@ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -326,6 +328,9 @@ c6x) basic_machine=tic6x-unknown ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none @@ -436,6 +441,7 @@ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ + | visium-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -773,6 +779,9 @@ basic_machine=m68k-isi os=-sysv ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + ;; m68knommu) basic_machine=m68k-unknown os=-linux diff -Nru libsoup2.4-2.52.2/build-aux/depcomp libsoup2.4-2.54.1/build-aux/depcomp --- libsoup2.4-2.52.2/build-aux/depcomp 2015-11-09 20:25:05.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/depcomp 2016-04-26 12:36:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru libsoup2.4-2.52.2/build-aux/install-sh libsoup2.4-2.54.1/build-aux/install-sh --- libsoup2.4-2.52.2/build-aux/install-sh 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/install-sh 2016-04-26 12:36:12.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru libsoup2.4-2.52.2/build-aux/ltmain.sh libsoup2.4-2.54.1/build-aux/ltmain.sh --- libsoup2.4-2.52.2/build-aux/ltmain.sh 2015-11-09 20:25:01.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/ltmain.sh 2016-04-26 12:36:08.000000000 +0000 @@ -1,9 +1,12 @@ +#! /bin/sh +## DO NOT EDIT - This file generated from ./build-aux/ltmain.in +## by inline-source v2014-01-03.01 -# libtool (GNU libtool) 2.4.2 +# libtool (GNU libtool) 2.4.6 +# Provide generalized library-building support services. # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996-2015 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. @@ -23,881 +26,2112 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, -# or obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . -# Usage: $progname [OPTION]... [MODE-ARG]... -# -# 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) -# --no-warn don't display warning messages -# --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 -# -# 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 -# -# 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. -# 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.4.2 -# automake: $automake_version -# autoconf: $autoconf_version -# -# Report bugs to . -# GNU libtool home page: . -# General help using GNU software: . PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.2 -TIMESTAMP="" -package_revision=1.3337 +VERSION=2.4.6 +package_revision=2.4.6 -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + +## ------ ## +## Usage. ## +## ------ ## + +# Run './libtool --help' for help with using this script from the +# command line. + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# After configure completes, it has a better idea of some of the +# shell tools we need than the defaults used by the functions shared +# with bootstrap, so set those here where they can still be over- +# ridden by the user, but otherwise take precedence. + +: ${AUTOCONF="autoconf"} +: ${AUTOMAKE="automake"} + + +## -------------------------- ## +## Source external libraries. ## +## -------------------------- ## + +# Much of our low-level functionality needs to be sourced from external +# libraries, which are installed to $pkgauxdir. + +# Set a version string for this script. +scriptversion=2015-01-20.17; # UTC + +# General shell script boiler plate, and helper functions. +# Written by Gary V. Vaughan, 2004 + +# Copyright (C) 2004-2015 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. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# As a special exception to the GNU General Public License, if you distribute +# this file as part of a program or library that is built using GNU Libtool, +# you may include this file under the same distribution terms that you use +# for the rest of that program. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# Evaluate this file near the top of your script to gain access to +# the functions and variables defined here: +# +# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh +# +# If you need to override any of the default environment variable +# settings, do that before evaluating this file. + + +## -------------------- ## +## Shell normalisation. ## +## -------------------- ## + +# Some shells need a little help to be as Bourne compatible as possible. +# Before doing anything else, make sure all that help has been provided! + +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac + case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac fi -BIN_SH=xpg4; export BIN_SH # for Tru64 -DUALCASE=1; export DUALCASE # for MKS sh - -# 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. -lt_user_locale= -lt_safe_locale= -for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +# NLS nuisances: We save the old values in case they are required later. +_G_user_locale= +_G_safe_locale= +for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES do - eval "if test \"\${$lt_var+set}\" = set; then - save_$lt_var=\$$lt_var - $lt_var=C - export $lt_var - lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\" - lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" + eval "if test set = \"\${$_G_var+set}\"; then + save_$_G_var=\$$_G_var + $_G_var=C + export $_G_var + _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\" + _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done -LC_ALL=C -LANGUAGE=C -export LANGUAGE LC_ALL -$lt_unset CDPATH +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + +# Make sure IFS has a sensible default +sp=' ' +nl=' +' +IFS="$sp $nl" +# There are apparently some retarded systems that use ';' as a PATH separator! +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } +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" +## ------------------------- ## +## Locate command utilities. ## +## ------------------------- ## + + +# func_executable_p FILE +# ---------------------- +# Check that FILE is an executable regular file. +func_executable_p () +{ + test -f "$1" && test -x "$1" +} + + +# func_path_progs PROGS_LIST CHECK_FUNC [PATH] +# -------------------------------------------- +# Search for either a program that responds to --version with output +# containing "GNU", or else returned by CHECK_FUNC otherwise, by +# trying all the directories in PATH with each of the elements of +# PROGS_LIST. +# +# CHECK_FUNC should accept the path to a candidate program, and +# set $func_check_prog_result if it truncates its output less than +# $_G_path_prog_max characters. +func_path_progs () +{ + _G_progs_list=$1 + _G_check_func=$2 + _G_PATH=${3-"$PATH"} + + _G_path_prog_max=0 + _G_path_prog_found=false + _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:} + for _G_dir in $_G_PATH; do + IFS=$_G_save_IFS + test -z "$_G_dir" && _G_dir=. + for _G_prog_name in $_G_progs_list; do + for _exeext in '' .EXE; do + _G_path_prog=$_G_dir/$_G_prog_name$_exeext + func_executable_p "$_G_path_prog" || continue + case `"$_G_path_prog" --version 2>&1` in + *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;; + *) $_G_check_func $_G_path_prog + func_path_progs_result=$func_check_prog_result + ;; + esac + $_G_path_prog_found && break 3 + done + done + done + IFS=$_G_save_IFS + test -z "$func_path_progs_result" && { + echo "no acceptable sed could be found in \$PATH" >&2 + exit 1 + } +} + + +# We want to be able to use the functions in this file before configure +# has figured out where the best binaries are kept, which means we have +# to search for them ourselves - except when the results are already set +# where we skip the searches. + +# Unless the user overrides by setting SED, search the path for either GNU +# sed, or the sed that truncates its output the least. +test -z "$SED" && { + _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for _G_i in 1 2 3 4 5 6 7; do + _G_sed_script=$_G_sed_script$nl$_G_sed_script + done + echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed + _G_sed_script= + + func_check_prog_sed () + { + _G_path_prog=$1 + + _G_count=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo '' >> conftest.nl + "$_G_path_prog" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + rm -f conftest.sed + SED=$func_path_progs_result +} + + +# Unless the user overrides by setting GREP, search the path for either GNU +# grep, or the grep that truncates its output the least. +test -z "$GREP" && { + func_check_prog_grep () + { + _G_path_prog=$1 + + _G_count=0 + _G_path_prog_max=0 + printf 0123456789 >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo 'GREP' >> conftest.nl + "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + _G_count=`expr $_G_count + 1` + if test "$_G_count" -gt "$_G_path_prog_max"; then + # Best one so far, save it but keep looking for a better one + func_check_prog_result=$_G_path_prog + _G_path_prog_max=$_G_count + fi + # 10*(2^10) chars as input seems more than enough + test 10 -lt "$_G_count" && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out + } + + func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + GREP=$func_path_progs_result +} + + +## ------------------------------- ## +## User overridable command paths. ## +## ------------------------------- ## + +# All uppercase variable names are used for environment variables. These +# variables can be overridden by the user before calling a script that +# uses them if a suitable command of that name is not already available +# in the command search PATH. : ${CP="cp -f"} -test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} +: ${ECHO="printf %s\n"} +: ${EGREP="$GREP -E"} +: ${FGREP="$GREP -F"} +: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} -: ${Xsed="$SED -e 1s/^X//"} - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. -EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. - -exit_status=$EXIT_SUCCESS - -# Make sure IFS has a sensible default -lt_nl=' -' -IFS=" $lt_nl" -dirname="s,/[^/]*$,," -basename="s,^.*/,," -# func_dirname file append nondir_replacement -# Compute the dirname of FILE. If nonempty, add APPEND to the result, -# otherwise set result to NONDIR_REPLACEMENT. -func_dirname () -{ - func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi -} # func_dirname may be replaced by extended shell implementation +## -------------------- ## +## Useful sed snippets. ## +## -------------------- ## +sed_dirname='s|/[^/]*$||' +sed_basename='s|^.*/||' -# func_basename file -func_basename () -{ - func_basename_result=`$ECHO "${1}" | $SED "$basename"` -} # func_basename may be replaced by extended shell implementation +# 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. +sed_double_quote_subst='s/\(["`\\]\)/\\\1/g' -# func_dirname_and_basename file append nondir_replacement -# perform func_basename and func_dirname in a single function -# call: -# dirname: Compute the dirname of FILE. If nonempty, -# add APPEND to the result, otherwise set result -# to NONDIR_REPLACEMENT. -# value returned in "$func_dirname_result" -# basename: Compute filename of FILE. -# value retuned in "$func_basename_result" -# Implementation must be kept synchronized with func_dirname -# and func_basename. For efficiency, we do not delegate to -# those functions but instead duplicate the functionality here. -func_dirname_and_basename () -{ - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` -} # func_dirname_and_basename may be replaced by extended shell implementation +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g' +# Sed substitution that converts a w32 file name or path +# that contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' -# func_stripname prefix suffix name -# strip PREFIX and SUFFIX off of NAME. -# PREFIX and SUFFIX must not contain globbing or regex special -# characters, hashes, percent signs, but SUFFIX may contain a leading -# dot (in which case that matches only a dot). -# func_strip_suffix prefix name -func_stripname () -{ - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; - esac -} # func_stripname may be replaced by extended shell implementation +# Re-'\' parameter expansions in output of sed_double_quote_subst that +# were '\'-ed in input to the same. If an odd number of '\' preceded a +# '$' in input to sed_double_quote_subst, that '$' was protected from +# expansion. Since each input '\' is now two '\'s, look for any number +# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'. +_G_bs='\\' +_G_bs2='\\\\' +_G_bs4='\\\\\\\\' +_G_dollar='\$' +sed_double_backslash="\ + s/$_G_bs4/&\\ +/g + s/^$_G_bs2$_G_dollar/$_G_bs&/ + s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g + s/\n//g" -# 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,/*$,/,' +## ----------------- ## +## Global variables. ## +## ----------------- ## + +# Except for the global variables explicitly listed below, the following +# functions in the '^func_' namespace, and the '^require_' namespace +# variables initialised in the 'Resource management' section, sourcing +# this file will not pollute your global namespace with anything +# else. There's no portable way to scope variables in Bourne shell +# though, so actually running these functions will sometimes place +# results into a variable named after the function, and often use +# temporary variables in the '^_G_' namespace. If you are careful to +# avoid using those namespaces casually in your sourcing script, things +# should continue to work as you expect. And, of course, you can freely +# overwrite any of the functions or variables defined here before +# calling anything to customize them. -# 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 -} +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing. +EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake. -# 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 +# Allow overriding, eg assuming that you follow the convention of +# putting '$debug_cmd' at the start of all your functions, you can get +# bash to show function call trace with: +# +# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name +debug_cmd=${debug_cmd-":"} +exit_cmd=: - # 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 +# By convention, finish your script with: +# +# exit $exit_status +# +# so that you can set exit_status to non-zero if you want to indicate +# something went wrong during execution without actually bailing out at +# the point of failure. +exit_status=$EXIT_SUCCESS - # 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: -func_dirname_and_basename "$progpath" -progname=$func_basename_result +# The name of this program. +progname=`$ECHO "$progpath" |$SED "$sed_basename"` -# Make sure we have an absolute path for reexecution: +# Make sure we have an absolute progpath for reexecution: case $progpath in [\\/]*|[A-Za-z]:\\*) ;; *[\\/]*) - progdir=$func_dirname_result + progdir=`$ECHO "$progpath" |$SED "$sed_dirname"` progdir=`cd "$progdir" && pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; *) - save_IFS="$IFS" + _G_IFS=$IFS IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do - IFS="$save_IFS" + IFS=$_G_IFS test -x "$progdir/$progname" && break done - IFS="$save_IFS" + IFS=$_G_IFS test -n "$progdir" || progdir=`pwd` - progpath="$progdir/$progname" + progpath=$progdir/$progname ;; esac -# 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='s/\([`"$\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\(["`\\]\)/\\\1/g' - -# Sed substitution that turns a string into a regex matching for the -# string literally. -sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' -# Sed substitution that converts a w32 file name or path -# which contains forward slashes, into one that contains -# (escaped) backslashes. A very naive implementation. -lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - -# Re-`\' parameter expansions in output of double_quote_subst that were -# `\'-ed in input to the same. If an odd number of `\' preceded a '$' -# in input to double_quote_subst, that '$' was protected from expansion. -# Since each input `\' is now two `\'s, look for any number of runs of -# four `\'s followed by two `\'s and then a '$'. `\' that '$'. -bs='\\' -bs2='\\\\' -bs4='\\\\\\\\' -dollar='\$' -sed_double_backslash="\ - s/$bs4/&\\ -/g - s/^$bs2$dollar/$bs&/ - s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g - s/\n//g" +## ----------------- ## +## Standard options. ## +## ----------------- ## + +# The following options affect the operation of the functions defined +# below, and should be set appropriately depending on run-time para- +# meters passed on the command line. -# Standard options: opt_dry_run=false -opt_help=false opt_quiet=false opt_verbose=false -opt_warning=: - -# func_echo arg... -# Echo program name prefixed message, along with the current mode -# name if it has been set yet. -func_echo () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }$*" -} -# func_verbose arg... -# Echo program name prefixed message in verbose mode only. -func_verbose () -{ - $opt_verbose && func_echo ${1+"$@"} +# Categories 'all' and 'none' are always available. Append any others +# you will pass as the first argument to func_warning from your own +# code. +warning_categories= + +# By default, display warnings according to 'opt_warning_types'. Set +# 'warning_func' to ':' to elide all warnings, or func_fatal_error to +# treat the next displayed warning as a fatal error. +warning_func=func_warn_and_continue + +# Set to 'all' to display all warnings, 'none' to suppress all +# warnings, or a space delimited list of some subset of +# 'warning_categories' to display only the listed warnings. +opt_warning_types=all + + +## -------------------- ## +## Resource management. ## +## -------------------- ## + +# This section contains definitions for functions that each ensure a +# particular resource (a file, or a non-empty configuration variable for +# example) is available, and if appropriate to extract default values +# from pertinent package files. Call them using their associated +# 'require_*' variable to ensure that they are executed, at most, once. +# +# It's entirely deliberate that calling these functions can set +# variables that don't obey the namespace limitations obeyed by the rest +# of this file, in order that that they be as useful as possible to +# callers. + + +# require_term_colors +# ------------------- +# Allow display of bold text on terminals that support it. +require_term_colors=func_require_term_colors +func_require_term_colors () +{ + $debug_cmd + + test -t 1 && { + # COLORTERM and USE_ANSI_COLORS environment variables take + # precedence, because most terminfo databases neglect to describe + # whether color sequences are supported. + test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"} + + if test 1 = "$USE_ANSI_COLORS"; then + # Standard ANSI escape sequences + tc_reset='' + tc_bold=''; tc_standout='' + tc_red=''; tc_green='' + tc_blue=''; tc_cyan='' + else + # Otherwise trust the terminfo database after all. + test -n "`tput sgr0 2>/dev/null`" && { + tc_reset=`tput sgr0` + test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold` + tc_standout=$tc_bold + test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso` + test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1` + test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2` + test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4` + test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5` + } + fi + } - # A bug in bash halts the script if the last line of a function - # fails when set -e is in force, so we need another command to - # work around that: - : + require_term_colors=: } -# 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 () -{ - $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 -} +## ----------------- ## +## Function library. ## +## ----------------- ## -# func_warning arg... -# Echo program name prefixed warning message to standard error. -func_warning () -{ - $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 +# This section contains a variety of useful functions to call in your +# scripts. Take note of the portable wrappers for features provided by +# some modern shells, which will fall back to slower equivalents on +# less featureful shells. - # bash bug again: - : -} -# func_fatal_error arg... -# Echo program name prefixed message to standard error, and exit. -func_fatal_error () -{ - func_error ${1+"$@"} - exit $EXIT_FAILURE -} +# func_append VAR VALUE +# --------------------- +# Append VALUE onto the existing contents of VAR. -# func_fatal_help arg... -# Echo program name prefixed message to standard error, followed by -# a help hint, and exit. -func_fatal_help () -{ - func_error ${1+"$@"} - func_fatal_error "$help" -} -help="Try \`$progname --help' for more information." ## default + # We should try to minimise forks, especially on Windows where they are + # unreasonably slow, so skip the feature probes when bash or zsh are + # being used: + if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then + : ${_G_HAVE_ARITH_OP="yes"} + : ${_G_HAVE_XSI_OPS="yes"} + # The += operator was introduced in bash 3.1 + case $BASH_VERSION in + [12].* | 3.0 | 3.0*) ;; + *) + : ${_G_HAVE_PLUSEQ_OP="yes"} + ;; + esac + fi + # _G_HAVE_PLUSEQ_OP + # Can be empty, in which case the shell is probed, "yes" if += is + # useable or anything else if it does not work. + test -z "$_G_HAVE_PLUSEQ_OP" \ + && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \ + && _G_HAVE_PLUSEQ_OP=yes + +if test yes = "$_G_HAVE_PLUSEQ_OP" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_append () + { + $debug_cmd + + eval "$1+=\$2" + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_append () + { + $debug_cmd + + eval "$1=\$$1\$2" + } +fi + + +# func_append_quoted VAR VALUE +# ---------------------------- +# Quote VALUE and append to the end of shell variable VAR, separated +# by a space. +if test yes = "$_G_HAVE_PLUSEQ_OP"; then + eval 'func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1+=\\ \$func_quote_for_eval_result" + }' +else + func_append_quoted () + { + $debug_cmd + + func_quote_for_eval "$2" + eval "$1=\$$1\\ \$func_quote_for_eval_result" + } +fi + + +# func_append_uniq VAR VALUE +# -------------------------- +# Append unique VALUE onto the existing contents of VAR, assuming +# entries are delimited by the first character of VALUE. For example: +# +# func_append_uniq options " --another-option option-argument" +# +# will only append to $options if " --another-option option-argument " +# is not already present somewhere in $options already (note spaces at +# each end implied by leading space in second argument). +func_append_uniq () +{ + $debug_cmd + + eval _G_current_value='`$ECHO $'$1'`' + _G_delim=`expr "$2" : '\(.\)'` + + case $_G_delim$_G_current_value$_G_delim in + *"$2$_G_delim"*) ;; + *) func_append "$@" ;; + esac +} + + +# func_arith TERM... +# ------------------ +# Set func_arith_result to the result of evaluating TERMs. + test -z "$_G_HAVE_ARITH_OP" \ + && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \ + && _G_HAVE_ARITH_OP=yes + +if test yes = "$_G_HAVE_ARITH_OP"; then + eval 'func_arith () + { + $debug_cmd + + func_arith_result=$(( $* )) + }' +else + func_arith () + { + $debug_cmd + + func_arith_result=`expr "$@"` + } +fi + + +# func_basename FILE +# ------------------ +# Set func_basename_result to FILE with everything up to and including +# the last / stripped. +if test yes = "$_G_HAVE_XSI_OPS"; then + # If this shell supports suffix pattern removal, then use it to avoid + # forking. Hide the definitions single quotes in case the shell chokes + # on unsupported syntax... + _b='func_basename_result=${1##*/}' + _d='case $1 in + */*) func_dirname_result=${1%/*}$2 ;; + * ) func_dirname_result=$3 ;; + esac' + +else + # ...otherwise fall back to using sed. + _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`' + _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"` + if test "X$func_dirname_result" = "X$1"; then + func_dirname_result=$3 + else + func_append func_dirname_result "$2" + fi' +fi + +eval 'func_basename () +{ + $debug_cmd + + '"$_b"' +}' + + +# func_dirname FILE APPEND NONDIR_REPLACEMENT +# ------------------------------------------- +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +eval 'func_dirname () +{ + $debug_cmd -# func_grep expression filename + '"$_d"' +}' + + +# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT +# -------------------------------------------------------- +# Perform func_basename and func_dirname in a single function +# call: +# dirname: Compute the dirname of FILE. If nonempty, +# add APPEND to the result, otherwise set result +# to NONDIR_REPLACEMENT. +# value returned in "$func_dirname_result" +# basename: Compute filename of FILE. +# value retuned in "$func_basename_result" +# For efficiency, we do not delegate to the functions above but instead +# duplicate the functionality here. +eval 'func_dirname_and_basename () +{ + $debug_cmd + + '"$_b"' + '"$_d"' +}' + + +# func_echo ARG... +# ---------------- +# Echo program name prefixed message. +func_echo () +{ + $debug_cmd + + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname: $_G_line" + done + IFS=$func_echo_IFS +} + + +# func_echo_all ARG... +# -------------------- +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + + +# func_echo_infix_1 INFIX ARG... +# ------------------------------ +# Echo program name, followed by INFIX on the first line, with any +# additional lines not showing INFIX. +func_echo_infix_1 () +{ + $debug_cmd + + $require_term_colors + + _G_infix=$1; shift + _G_indent=$_G_infix + _G_prefix="$progname: $_G_infix: " + _G_message=$* + + # Strip color escape sequences before counting printable length + for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan" + do + test -n "$_G_tc" && { + _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"` + _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"` + } + done + _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes + + func_echo_infix_1_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_infix_1_IFS + $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2 + _G_prefix=$_G_indent + done + IFS=$func_echo_infix_1_IFS +} + + +# func_error ARG... +# ----------------- +# Echo program name prefixed message to standard error. +func_error () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2 +} + + +# func_fatal_error ARG... +# ----------------------- +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + $debug_cmd + + func_error "$*" + exit $EXIT_FAILURE +} + + +# func_grep EXPRESSION FILENAME +# ----------------------------- # Check whether EXPRESSION matches any line of FILENAME, without output. func_grep () { + $debug_cmd + $GREP "$1" "$2" >/dev/null 2>&1 } -# func_mkdir_p directory-path +# func_len STRING +# --------------- +# Set func_len_result to the length of STRING. STRING may not +# start with a hyphen. + test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_len () + { + $debug_cmd + + func_len_result=${#1} + }' +else + func_len () + { + $debug_cmd + + func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len` + } +fi + + +# func_mkdir_p DIRECTORY-PATH +# --------------------------- # Make sure the entire path to DIRECTORY-PATH is available. func_mkdir_p () { - my_directory_path="$1" - my_dir_list= + $debug_cmd + + _G_directory_path=$1 + _G_dir_list= - if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then + if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then - # Protect directory names starting with `-' - case $my_directory_path in - -*) my_directory_path="./$my_directory_path" ;; + # Protect directory names starting with '-' + case $_G_directory_path in + -*) _G_directory_path=./$_G_directory_path ;; esac # While some portion of DIR does not yet exist... - while test ! -d "$my_directory_path"; do + while test ! -d "$_G_directory_path"; do # ...make a list in topmost first order. Use a colon delimited # list incase some portion of path contains whitespace. - my_dir_list="$my_directory_path:$my_dir_list" + _G_dir_list=$_G_directory_path:$_G_dir_list # If the last portion added has no slash in it, the list is done - case $my_directory_path in */*) ;; *) break ;; esac + case $_G_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` + _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"` done - my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` + _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'` - save_mkdir_p_IFS="$IFS"; IFS=':' - for my_dir in $my_dir_list; do - IFS="$save_mkdir_p_IFS" - # mkdir can fail with a `File exist' error if two processes + func_mkdir_p_IFS=$IFS; IFS=: + for _G_dir in $_G_dir_list; do + IFS=$func_mkdir_p_IFS + # mkdir can fail with a 'File exist' error if two processes # try to create one of the directories concurrently. Don't # stop in that case! - $MKDIR "$my_dir" 2>/dev/null || : + $MKDIR "$_G_dir" 2>/dev/null || : done - IFS="$save_mkdir_p_IFS" + IFS=$func_mkdir_p_IFS # Bail out if we (or some other process) failed to create a directory. - test -d "$my_directory_path" || \ - func_fatal_error "Failed to create \`$1'" + test -d "$_G_directory_path" || \ + func_fatal_error "Failed to create '$1'" fi } -# func_mktempdir [string] +# func_mktempdir [BASENAME] +# ------------------------- # Make a temporary directory that won't clash with other running # libtool processes, and avoids race conditions if possible. If -# given, STRING is the basename for that directory. +# given, BASENAME is the basename for that directory. func_mktempdir () { - my_template="${TMPDIR-/tmp}/${1-$progname}" + $debug_cmd + + _G_template=${TMPDIR-/tmp}/${1-$progname} - if test "$opt_dry_run" = ":"; then + if test : = "$opt_dry_run"; then # Return a directory name, but don't create it in dry-run mode - my_tmpdir="${my_template}-$$" + _G_tmpdir=$_G_template-$$ else # If mktemp works, use that first and foremost - my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null` - if test ! -d "$my_tmpdir"; then + if test ! -d "$_G_tmpdir"; then # Failing that, at least try and use $RANDOM to avoid a race - my_tmpdir="${my_template}-${RANDOM-0}$$" + _G_tmpdir=$_G_template-${RANDOM-0}$$ + + func_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$_G_tmpdir" + umask $func_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$_G_tmpdir" || \ + func_fatal_error "cannot create temporary directory '$_G_tmpdir'" + fi + + $ECHO "$_G_tmpdir" +} + + +# 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. +func_normal_abspath () +{ + $debug_cmd + + # These SED scripts presuppose an absolute path with a trailing slash. + _G_pathcar='s|^/\([^/]*\).*$|\1|' + _G_pathcdr='s|^/[^/]*||' + _G_removedotparts=':dotsl + s|/\./|/|g + t dotsl + s|/\.$|/|' + _G_collapseslashes='s|/\{1,\}|/|g' + _G_finalslash='s|/*$|/|' + + # 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 "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_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 "$_G_pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$_G_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_append 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_notquiet ARG... +# -------------------- +# Echo program name prefixed message only when not in quiet mode. +func_notquiet () +{ + $debug_cmd + + $opt_quiet || func_echo ${1+"$@"} + + # A bug in bash halts the script if the last line of a function + # fails when set -e is in force, so we need another command to + # work around that: + : +} + + +# func_relative_path SRCDIR DSTDIR +# -------------------------------- +# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR. +func_relative_path () +{ + $debug_cmd + + 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 -z "$func_relative_path_tlibdir"; 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 -n "$func_stripname_result"; then + func_append func_relative_path_result "/$func_stripname_result" + fi + + # Normalisation. If bindir is libdir, return '.' else relative path. + if test -n "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + fi + + test -n "$func_relative_path_result" || func_relative_path_result=. + + : +} + + +# func_quote_for_eval ARG... +# -------------------------- +# Aesthetically quote ARGs to be evaled later. +# This function returns two values: +# i) func_quote_for_eval_result +# double-quoted, suitable for a subsequent eval +# ii) func_quote_for_eval_unquoted_result +# has all characters that are still active within double +# quotes backslashified. +func_quote_for_eval () +{ + $debug_cmd + + func_quote_for_eval_unquoted_result= + func_quote_for_eval_result= + while test 0 -lt $#; do + case $1 in + *[\\\`\"\$]*) + _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; + *) + _G_unquoted_arg=$1 ;; + esac + if test -n "$func_quote_for_eval_unquoted_result"; then + func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" + else + func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + fi + + case $_G_unquoted_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_quoted_arg=\"$_G_unquoted_arg\" + ;; + *) + _G_quoted_arg=$_G_unquoted_arg + ;; + esac + + if test -n "$func_quote_for_eval_result"; then + func_append func_quote_for_eval_result " $_G_quoted_arg" + else + func_append func_quote_for_eval_result "$_G_quoted_arg" + fi + shift + done +} + + +# func_quote_for_expand ARG +# ------------------------- +# Aesthetically quote ARG to be evaled later; same as above, +# but do not quote variable references. +func_quote_for_expand () +{ + $debug_cmd + + case $1 in + *[\\\`\"]*) + _G_arg=`$ECHO "$1" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; + *) + _G_arg=$1 ;; + esac + + case $_G_arg in + # Double-quote args containing shell metacharacters to delay + # word splitting and command substitution for a subsequent eval. + # Many Bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + _G_arg=\"$_G_arg\" + ;; + esac + + func_quote_for_expand_result=$_G_arg +} + + +# func_stripname PREFIX SUFFIX NAME +# --------------------------------- +# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_stripname () + { + $debug_cmd + + # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are + # positional parameters, so assign one to ordinary variable first. + func_stripname_result=$3 + func_stripname_result=${func_stripname_result#"$1"} + func_stripname_result=${func_stripname_result%"$2"} + }' +else + func_stripname () + { + $debug_cmd + + case $2 in + .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;; + *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;; + esac + } +fi + + +# func_show_eval CMD [FAIL_EXP] +# ----------------------------- +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. +func_show_eval () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + func_quote_for_expand "$_G_cmd" + eval "func_notquiet $func_quote_for_expand_result" + + $opt_dry_run || { + eval "$_G_cmd" + _G_status=$? + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_show_eval_locale CMD [FAIL_EXP] +# ------------------------------------ +# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is +# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP +# is given, then evaluate it. Use the saved locale for evaluation. +func_show_eval_locale () +{ + $debug_cmd + + _G_cmd=$1 + _G_fail_exp=${2-':'} + + $opt_quiet || { + func_quote_for_expand "$_G_cmd" + eval "func_echo $func_quote_for_expand_result" + } + + $opt_dry_run || { + eval "$_G_user_locale + $_G_cmd" + _G_status=$? + eval "$_G_safe_locale" + if test 0 -ne "$_G_status"; then + eval "(exit $_G_status); $_G_fail_exp" + fi + } +} + + +# func_tr_sh +# ---------- +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + $debug_cmd + + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} + + +# func_verbose ARG... +# ------------------- +# Echo program name prefixed message in verbose mode only. +func_verbose () +{ + $debug_cmd + + $opt_verbose && func_echo "$*" + + : +} + + +# func_warn_and_continue ARG... +# ----------------------------- +# Echo program name prefixed warning message to standard error. +func_warn_and_continue () +{ + $debug_cmd + + $require_term_colors + + func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2 +} + + +# func_warning CATEGORY ARG... +# ---------------------------- +# Echo program name prefixed warning message to standard error. Warning +# messages can be filtered according to CATEGORY, where this function +# elides messages where CATEGORY is not listed in the global variable +# 'opt_warning_types'. +func_warning () +{ + $debug_cmd + + # CATEGORY must be in the warning_categories list! + case " $warning_categories " in + *" $1 "*) ;; + *) func_internal_error "invalid warning category '$1'" ;; + esac + + _G_category=$1 + shift + + case " $opt_warning_types " in + *" $_G_category "*) $warning_func ${1+"$@"} ;; + esac +} + + +# func_sort_ver VER1 VER2 +# ----------------------- +# 'sort -V' is not generally available. +# Note this deviates from the version comparison in automake +# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a +# but this should suffice as we won't be specifying old +# version formats or redundant trailing .0 in bootstrap.conf. +# If we did want full compatibility then we should probably +# use m4_version_compare from autoconf. +func_sort_ver () +{ + $debug_cmd + + printf '%s\n%s\n' "$1" "$2" \ + | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n +} + +# func_lt_ver PREV CURR +# --------------------- +# Return true if PREV and CURR are in the correct order according to +# func_sort_ver, otherwise false. Use it like this: +# +# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..." +func_lt_ver () +{ + $debug_cmd + + test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q` +} + + +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: +#! /bin/sh + +# Set a version string for this script. +scriptversion=2014-01-07.03; # UTC + +# A portable, pluggable option parser for Bourne shell. +# Written by Gary V. Vaughan, 2010 + +# Copyright (C) 2010-2015 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. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Please report bugs or propose patches to gary@gnu.org. + + +## ------ ## +## Usage. ## +## ------ ## + +# This file is a library for parsing options in your shell scripts along +# with assorted other useful supporting features that you can make use +# of too. +# +# For the simplest scripts you might need only: +# +# #!/bin/sh +# . relative/path/to/funclib.sh +# . relative/path/to/options-parser +# scriptversion=1.0 +# func_options ${1+"$@"} +# eval set dummy "$func_options_result"; shift +# ...rest of your script... +# +# In order for the '--version' option to work, you will need to have a +# suitably formatted comment like the one at the top of this file +# starting with '# Written by ' and ending with '# warranty; '. +# +# For '-h' and '--help' to work, you will also need a one line +# description of your script's purpose in a comment directly above the +# '# Written by ' line, like the one at the top of this file. +# +# The default options also support '--debug', which will turn on shell +# execution tracing (see the comment above debug_cmd below for another +# use), and '--verbose' and the func_verbose function to allow your script +# to display verbose messages only when your user has specified +# '--verbose'. +# +# After sourcing this file, you can plug processing for additional +# options by amending the variables from the 'Configuration' section +# below, and following the instructions in the 'Option parsing' +# section further down. + +## -------------- ## +## Configuration. ## +## -------------- ## + +# You should override these variables in your script after sourcing this +# file so that they reflect the customisations you have added to the +# option parser. + +# The usage line for option parsing errors and the start of '-h' and +# '--help' output messages. You can embed shell variables for delayed +# expansion at the time the message is displayed, but you will need to +# quote other shell meta-characters carefully to prevent them being +# expanded when the contents are evaled. +usage='$progpath [OPTION]...' + +# Short help message in response to '-h' and '--help'. Add to this or +# override it after sourcing this library to reflect the full set of +# options your script accepts. +usage_message="\ + --debug enable verbose shell tracing + -W, --warnings=CATEGORY + report the warnings falling in CATEGORY [all] + -v, --verbose verbosely report processing + --version print version information and exit + -h, --help print short or long help message and exit +" + +# Additional text appended to 'usage_message' in response to '--help'. +long_help_message=" +Warning categories include: + 'all' show all warnings + 'none' turn off all the warnings + 'error' warnings are treated as fatal errors" + +# Help message printed before fatal option parsing errors. +fatal_help="Try '\$progname --help' for more information." + + + +## ------------------------- ## +## Hook function management. ## +## ------------------------- ## + +# This section contains functions for adding, removing, and running hooks +# to the main code. A hook is just a named list of of function, that can +# be run in order later on. + +# func_hookable FUNC_NAME +# ----------------------- +# Declare that FUNC_NAME will run hooks added with +# 'func_add_hook FUNC_NAME ...'. +func_hookable () +{ + $debug_cmd + + func_append hookable_fns " $1" +} + + +# func_add_hook FUNC_NAME HOOK_FUNC +# --------------------------------- +# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must +# first have been declared "hookable" by a call to 'func_hookable'. +func_add_hook () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not accept hook functions." ;; + esac + + eval func_append ${1}_hooks '" $2"' +} + + +# func_remove_hook FUNC_NAME HOOK_FUNC +# ------------------------------------ +# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +func_remove_hook () +{ + $debug_cmd + + eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`' +} + + +# func_run_hooks FUNC_NAME [ARG]... +# --------------------------------- +# Run all hook functions registered to FUNC_NAME. +# It is assumed that the list of hook functions contains nothing more +# than a whitespace-delimited list of legal shell function names, and +# no effort is wasted trying to catch shell meta-characters or preserve +# whitespace. +func_run_hooks () +{ + $debug_cmd + + case " $hookable_fns " in + *" $1 "*) ;; + *) func_fatal_error "'$1' does not support hook funcions.n" ;; + esac + + eval _G_hook_fns=\$$1_hooks; shift + + for _G_hook in $_G_hook_fns; do + eval $_G_hook '"$@"' + + # store returned options list back into positional + # parameters for next 'cmd' execution. + eval _G_hook_result=\$${_G_hook}_result + eval set dummy "$_G_hook_result"; shift + done + + func_quote_for_eval ${1+"$@"} + func_run_hooks_result=$func_quote_for_eval_result +} + + + +## --------------- ## +## Option parsing. ## +## --------------- ## + +# In order to add your own option parsing hooks, you must accept the +# full positional parameter list in your hook function, remove any +# options that you action, and then pass back the remaining unprocessed +# options in '_result', escaped suitably for +# 'eval'. Like this: +# +# my_options_prep () +# { +# $debug_cmd +# +# # Extend the existing usage message. +# usage_message=$usage_message' +# -s, --silent don'\''t print informational messages +# ' +# +# func_quote_for_eval ${1+"$@"} +# my_options_prep_result=$func_quote_for_eval_result +# } +# func_add_hook func_options_prep my_options_prep +# +# +# my_silent_option () +# { +# $debug_cmd +# +# # Note that for efficiency, we parse as many options as we can +# # recognise in a loop before passing the remainder back to the +# # caller on the first unrecognised argument we encounter. +# while test $# -gt 0; do +# opt=$1; shift +# case $opt in +# --silent|-s) opt_silent=: ;; +# # Separate non-argument short options: +# -s*) func_split_short_opt "$_G_opt" +# set dummy "$func_split_short_opt_name" \ +# "-$func_split_short_opt_arg" ${1+"$@"} +# shift +# ;; +# *) set dummy "$_G_opt" "$*"; shift; break ;; +# esac +# done +# +# func_quote_for_eval ${1+"$@"} +# my_silent_option_result=$func_quote_for_eval_result +# } +# func_add_hook func_parse_options my_silent_option +# +# +# my_option_validation () +# { +# $debug_cmd +# +# $opt_silent && $opt_verbose && func_fatal_help "\ +# '--silent' and '--verbose' options are mutually exclusive." +# +# func_quote_for_eval ${1+"$@"} +# my_option_validation_result=$func_quote_for_eval_result +# } +# func_add_hook func_validate_options my_option_validation +# +# You'll alse need to manually amend $usage_message to reflect the extra +# options you parse. It's preferable to append if you can, so that +# multiple option parsing hooks can be added safely. + + +# func_options [ARG]... +# --------------------- +# All the functions called inside func_options are hookable. See the +# individual implementations for details. +func_hookable func_options +func_options () +{ + $debug_cmd - save_mktempdir_umask=`umask` - umask 0077 - $MKDIR "$my_tmpdir" - umask $save_mktempdir_umask - fi + func_options_prep ${1+"$@"} + eval func_parse_options \ + ${func_options_prep_result+"$func_options_prep_result"} + eval func_validate_options \ + ${func_parse_options_result+"$func_parse_options_result"} - # If we're not in dry-run mode, bomb out on failure - test -d "$my_tmpdir" || \ - func_fatal_error "cannot create temporary directory \`$my_tmpdir'" - fi + eval func_run_hooks func_options \ + ${func_validate_options_result+"$func_validate_options_result"} - $ECHO "$my_tmpdir" + # save modified positional parameters for caller + func_options_result=$func_run_hooks_result } -# func_quote_for_eval arg -# Aesthetically quote ARG to be evaled later. -# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT -# is double-quoted, suitable for a subsequent eval, whereas -# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters -# which are still active within double quotes backslashified. -func_quote_for_eval () +# func_options_prep [ARG]... +# -------------------------- +# All initialisations required before starting the option parse loop. +# Note that when calling hook functions, we pass through the list of +# positional parameters. If a hook function modifies that list, and +# needs to propogate that back to rest of this script, then the complete +# modified list must be put in 'func_run_hooks_result' before +# returning. +func_hookable func_options_prep +func_options_prep () { - case $1 in - *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; - *) - func_quote_for_eval_unquoted_result="$1" ;; - esac + $debug_cmd - case $func_quote_for_eval_unquoted_result in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and and variable - # expansion for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\"" - ;; - *) - func_quote_for_eval_result="$func_quote_for_eval_unquoted_result" - esac + # Option defaults: + opt_verbose=false + opt_warning_types= + + func_run_hooks func_options_prep ${1+"$@"} + + # save modified positional parameters for caller + func_options_prep_result=$func_run_hooks_result } -# func_quote_for_expand arg -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () +# func_parse_options [ARG]... +# --------------------------- +# The main option parsing loop. +func_hookable func_parse_options +func_parse_options () { - case $1 in - *[\\\`\"]*) - my_arg=`$ECHO "$1" | $SED \ - -e "$double_quote_subst" -e "$sed_double_backslash"` ;; - *) - my_arg="$1" ;; - esac + $debug_cmd - case $my_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - my_arg="\"$my_arg\"" - ;; - esac + func_parse_options_result= - func_quote_for_expand_result="$my_arg" -} + # this just eases exit handling + while test $# -gt 0; do + # Defer to hook functions for initial option parsing, so they + # get priority in the event of reusing an option name. + func_run_hooks func_parse_options ${1+"$@"} + # Adjust func_parse_options positional parameters to match + eval set dummy "$func_run_hooks_result"; shift -# func_show_eval cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. -func_show_eval () -{ - my_cmd="$1" - my_fail_exp="${2-:}" + # Break out of the loop if we already parsed every option. + test $# -gt 0 || break - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + _G_opt=$1 + shift + case $_G_opt in + --debug|-x) debug_cmd='set -x' + func_echo "enabling shell trace mode" + $debug_cmd + ;; + + --no-warnings|--no-warning|--no-warn) + set dummy --warnings none ${1+"$@"} + shift + ;; - if ${opt_dry_run-false}; then :; else - eval "$my_cmd" - my_status=$? - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi + --warnings|--warning|-W) + test $# = 0 && func_missing_arg $_G_opt && break + case " $warning_categories $1" in + *" $1 "*) + # trailing space prevents matching last $1 above + func_append_uniq opt_warning_types " $1" + ;; + *all) + opt_warning_types=$warning_categories + ;; + *none) + opt_warning_types=none + warning_func=: + ;; + *error) + opt_warning_types=$warning_categories + warning_func=func_fatal_error + ;; + *) + func_fatal_error \ + "unsupported warning category: '$1'" + ;; + esac + shift + ;; + + --verbose|-v) opt_verbose=: ;; + --version) func_version ;; + -\?|-h) func_usage ;; + --help) func_help ;; + + # Separate optargs to long options (plugins may need this): + --*=*) func_split_equals "$_G_opt" + set dummy "$func_split_equals_lhs" \ + "$func_split_equals_rhs" ${1+"$@"} + shift + ;; + + # Separate optargs to short options: + -W*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + # Separate non-argument short options: + -\?*|-h*|-v*|-x*) + func_split_short_opt "$_G_opt" + set dummy "$func_split_short_opt_name" \ + "-$func_split_short_opt_arg" ${1+"$@"} + shift + ;; + + --) break ;; + -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done + + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + func_parse_options_result=$func_quote_for_eval_result } -# func_show_eval_locale cmd [fail_exp] -# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is -# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP -# is given, then evaluate it. Use the saved locale for evaluation. -func_show_eval_locale () +# func_validate_options [ARG]... +# ------------------------------ +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +func_hookable func_validate_options +func_validate_options () { - my_cmd="$1" - my_fail_exp="${2-:}" + $debug_cmd - ${opt_silent-false} || { - func_quote_for_expand "$my_cmd" - eval "func_echo $func_quote_for_expand_result" - } + # Display all warnings if -W was not given. + test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if ${opt_dry_run-false}; then :; else - eval "$lt_user_locale - $my_cmd" - my_status=$? - eval "$lt_safe_locale" - if test "$my_status" -eq 0; then :; else - eval "(exit $my_status); $my_fail_exp" - fi - fi -} + func_run_hooks func_validate_options ${1+"$@"} -# func_tr_sh -# Turn $1 into a string suitable for a shell variable name. -# Result is stored in $func_tr_sh_result. All characters -# not in the set a-zA-Z0-9_ are replaced with '_'. Further, -# if $1 begins with a digit, a '_' is prepended as well. -func_tr_sh () -{ - case $1 in - [0-9]* | *[!a-zA-Z0-9_]*) - func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` - ;; - * ) - func_tr_sh_result=$1 - ;; - esac + # Bail if the options were screwed! + $exit_cmd $EXIT_FAILURE + + # save modified positional parameters for caller + func_validate_options_result=$func_run_hooks_result } -# func_version -# Echo version message to standard output and exit. -func_version () -{ - $opt_debug - $SED -n '/(C)/!b go - :more - /\./!{ - N - s/\n# / / - b more - } - :go - /^# '$PROGRAM' (GNU /,/# warranty; / { - s/^# // - s/^# *$// - s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ - p - }' < "$progpath" - exit $? -} +## ----------------- ## +## Helper functions. ## +## ----------------- ## -# func_usage -# Echo short help message to standard output and exit. -func_usage () +# This section contains the helper functions used by the rest of the +# hookable option parser framework in ascii-betical order. + + +# func_fatal_help ARG... +# ---------------------- +# Echo program name prefixed message to standard error, followed by +# a help hint, and exit. +func_fatal_help () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/^# *.*--help/ { - s/^# // - s/^# *$// - s/\$progname/'$progname'/ - p - }' < "$progpath" - echo - $ECHO "run \`$progname --help | more' for full usage" - exit $? + eval \$ECHO \""Usage: $usage"\" + eval \$ECHO \""$fatal_help"\" + func_error ${1+"$@"} + exit $EXIT_FAILURE } -# 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 () { - $opt_debug + $debug_cmd - $SED -n '/^# Usage:/,/# Report bugs to/ { - :print - s/^# // - s/^# *$// - s*\$progname*'$progname'* - s*\$host*'"$host"'* - s*\$SHELL*'"$SHELL"'* - s*\$LTCC*'"$LTCC"'* - s*\$LTCFLAGS*'"$LTCFLAGS"'* - s*\$LD*'"$LD"'* - s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ - p - d - } - /^# .* home page:/b print - /^# General help using/b print - ' < "$progpath" - ret=$? - if test -z "$1"; then - exit $ret - fi + func_usage_message + $ECHO "$long_help_message" + exit 0 } -# func_missing_arg argname + +# func_missing_arg ARGNAME +# ------------------------ # Echo program name prefixed message to standard error and set global # exit_cmd. func_missing_arg () { - $opt_debug + $debug_cmd - func_error "missing argument for $1." + func_error "Missing argument for '$1'." exit_cmd=exit } -# func_split_short_opt shortopt +# func_split_equals STRING +# ------------------------ +# Set func_split_equals_lhs and func_split_equals_rhs shell variables after +# splitting STRING at the '=' sign. +test -z "$_G_HAVE_XSI_OPS" \ + && (eval 'x=a/b/c; + test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ + && _G_HAVE_XSI_OPS=yes + +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=${1%%=*} + func_split_equals_rhs=${1#*=} + test "x$func_split_equals_lhs" = "x$1" \ + && func_split_equals_rhs= + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_equals () + { + $debug_cmd + + func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` + func_split_equals_rhs= + test "x$func_split_equals_lhs" = "x$1" \ + || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` + } +fi #func_split_equals + + +# func_split_short_opt SHORTOPT +# ----------------------------- # Set func_split_short_opt_name and func_split_short_opt_arg shell # variables after splitting SHORTOPT after the 2nd character. -func_split_short_opt () +if test yes = "$_G_HAVE_XSI_OPS" +then + # This is an XSI compatible shell, allowing a faster implementation... + eval 'func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_arg=${1#??} + func_split_short_opt_name=${1%"$func_split_short_opt_arg"} + }' +else + # ...otherwise fall back to using expr, which is often a shell builtin. + func_split_short_opt () + { + $debug_cmd + + func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` + } +fi #func_split_short_opt + + +# func_usage +# ---------- +# Echo short help message to standard output and exit. +func_usage () { - my_sed_short_opt='1s/^\(..\).*$/\1/;q' - my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + $debug_cmd - func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` - func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` -} # func_split_short_opt may be replaced by extended shell implementation + func_usage_message + $ECHO "Run '$progname --help |${PAGER-more}' for full usage" + exit 0 +} -# func_split_long_opt longopt -# Set func_split_long_opt_name and func_split_long_opt_arg shell -# variables after splitting LONGOPT at the `=' sign. -func_split_long_opt () +# func_usage_message +# ------------------ +# Echo short help message to standard output. +func_usage_message () { - my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' - my_sed_long_arg='1s/^--[^=]*=//' + $debug_cmd - func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` - func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` -} # func_split_long_opt may be replaced by extended shell implementation + eval \$ECHO \""Usage: $usage"\" + echo + $SED -n 's|^# || + /^Written by/{ + x;p;x + } + h + /^Written by/q' < "$progpath" + echo + eval \$ECHO \""$usage_message"\" +} -exit_cmd=: +# func_version +# ------------ +# Echo version message to standard output and exit. +func_version () +{ + $debug_cmd + printf '%s\n' "$progname $scriptversion" + $SED -n ' + /(C)/!b go + :more + /\./!{ + N + s|\n# | | + b more + } + :go + /^# Written by /,/# warranty; / { + s|^# || + s|^# *$|| + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + p + } + /^# Written by / { + s|^# || + p + } + /^warranty; /q' < "$progpath" + exit $? +} -magic="%%%MAGIC variable%%%" -magic_exe="%%%MAGIC EXE variable%%%" +# Local variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-time-zone: "UTC" +# End: -# Global variables. -nonopt= -preserve_args= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" -extracted_archives= -extracted_serial=0 +# Set a version string. +scriptversion='(GNU libtool) 2.4.6' -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= -# func_append var value -# Append VALUE to the end of shell variable VAR. -func_append () +# func_echo ARG... +# ---------------- +# Libtool also displays the current mode in messages, so override +# funclib.sh func_echo with this custom definition. +func_echo () { - eval "${1}=\$${1}\${2}" -} # func_append may be replaced by extended shell implementation + $debug_cmd -# func_append_quoted var value -# Quote VALUE and append to the end of shell variable VAR, separated -# by a space. -func_append_quoted () -{ - func_quote_for_eval "${2}" - eval "${1}=\$${1}\\ \$func_quote_for_eval_result" -} # func_append_quoted may be replaced by extended shell implementation + _G_message=$* + + func_echo_IFS=$IFS + IFS=$nl + for _G_line in $_G_message; do + IFS=$func_echo_IFS + $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line" + done + IFS=$func_echo_IFS +} -# func_arith arithmetic-term... -func_arith () +# func_warning ARG... +# ------------------- +# Libtool warnings are not categorized, so override funclib.sh +# func_warning with this simpler definition. +func_warning () { - func_arith_result=`expr "${@}"` -} # func_arith may be replaced by extended shell implementation + $debug_cmd + $warning_func ${1+"$@"} +} -# func_len string -# STRING may not start with a hyphen. -func_len () -{ - func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len` -} # func_len may be replaced by extended shell implementation +## ---------------- ## +## Options parsing. ## +## ---------------- ## + +# Hook in the functions to make sure our own options are parsed during +# the option parsing loop. + +usage='$progpath [OPTION]... [MODE-ARG]...' + +# Short help message in response to '-h'. +usage_message="Options: + --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 + --no-warnings equivalent to '-Wnone' + --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 more informational messages than default + --version print version information + -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all] + -h, --help, --help-all print short, long, or detailed help message +" -# func_lo2o object -func_lo2o () +# Additional text appended to 'usage_message' in response to '--help'. +func_help () { - func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` -} # func_lo2o may be replaced by extended shell implementation + $debug_cmd + func_usage_message + $ECHO "$long_help_message -# func_xform libobj-or-source -func_xform () -{ - func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` -} # func_xform may be replaced by extended shell implementation +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 + +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. +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) + version: $progname (GNU libtool) 2.4.6 + automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` + autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` + +Report bugs to . +GNU libtool home page: . +General help using GNU software: ." + exit 0 +} + + +# func_lo2o OBJECT-NAME +# --------------------- +# Transform OBJECT-NAME from a '.lo' suffix to the platform specific +# object suffix. + +lo2o=s/\\.lo\$/.$objext/ +o2lo=s/\\.$objext\$/.lo/ + +if test yes = "$_G_HAVE_XSI_OPS"; then + eval 'func_lo2o () + { + case $1 in + *.lo) func_lo2o_result=${1%.lo}.$objext ;; + * ) func_lo2o_result=$1 ;; + esac + }' + + # func_xform LIBOBJ-OR-SOURCE + # --------------------------- + # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise) + # suffix to a '.lo' libtool-object suffix. + eval 'func_xform () + { + func_xform_result=${1%.*}.lo + }' +else + # ...otherwise fall back to using sed. + func_lo2o () + { + func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"` + } + + func_xform () + { + func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'` + } +fi -# func_fatal_configuration arg... +# func_fatal_configuration ARG... +# ------------------------------- # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. func_fatal_configuration () { - func_error ${1+"$@"} - func_error "See the $PACKAGE documentation for more information." - func_fatal_error "Fatal configuration error." + func__fatal_error ${1+"$@"} \ + "See the $PACKAGE documentation for more information." \ + "Fatal configuration error." } # func_config +# ----------- # Display the configuration for all the tags in this script. func_config () { @@ -915,17 +2149,19 @@ exit $? } + # func_features +# ------------- # Display the features supported by this script. func_features () { echo "host: $host" - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then echo "enable shared libraries" else echo "disable shared libraries" fi - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then echo "enable static libraries" else echo "disable static libraries" @@ -934,289 +2170,297 @@ exit $? } -# func_enable_tag tagname + +# func_enable_tag TAGNAME +# ----------------------- # Verify that TAGNAME is valid, and either flag an error and exit, or # enable the TAGNAME tag. We also add TAGNAME to the global $taglist # variable here. func_enable_tag () { - # Global variable: - tagname="$1" + # Global variable: + tagname=$1 - re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" - re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" - sed_extractcf="/$re_begincf/,/$re_endcf/p" - - # Validate tagname. - case $tagname in - *[!-_A-Za-z0-9,/]*) - func_fatal_error "invalid tag name: $tagname" - ;; - esac + re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$" + re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$" + sed_extractcf=/$re_begincf/,/$re_endcf/p + + # Validate tagname. + case $tagname in + *[!-_A-Za-z0-9,/]*) + func_fatal_error "invalid tag name: $tagname" + ;; + esac - # Don't test for the "default" C tag, as we know it's - # there but not specially marked. - case $tagname in - CC) ;; + # Don't test for the "default" C tag, as we know it's + # there but not specially marked. + case $tagname in + CC) ;; *) - if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then - taglist="$taglist $tagname" + if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then + taglist="$taglist $tagname" - # Evaluate the configuration. Be careful to quote the path - # and the sed script, to avoid splitting on whitespace, but - # also don't use non-portable quotes within backquotes within - # quotes we have to do it in 2 steps: - extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` - eval "$extractedcf" - else - func_error "ignoring unknown tag $tagname" - fi - ;; - esac + # Evaluate the configuration. Be careful to quote the path + # and the sed script, to avoid splitting on whitespace, but + # also don't use non-portable quotes within backquotes within + # quotes we have to do it in 2 steps: + extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"` + eval "$extractedcf" + else + func_error "ignoring unknown tag $tagname" + fi + ;; + esac } + # func_check_version_match +# ------------------------ # Ensure that we are using m4 macros, and libtool script from the same # release of libtool. func_check_version_match () { - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from an older release. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - else - cat >&2 <<_LT_EOF + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, but the $progname: definition of this LT_INIT comes from $PACKAGE $macro_version. $progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION $progname: and run autoconf again. _LT_EOF - fi - else - cat >&2 <<_LT_EOF + fi + else + cat >&2 <<_LT_EOF $progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, $progname: but the definition of this LT_INIT comes from revision $macro_revision. $progname: You should recreate aclocal.m4 with macros from revision $package_revision $progname: of $PACKAGE $VERSION and run autoconf again. _LT_EOF - fi + fi - exit $EXIT_MISMATCH - fi + exit $EXIT_MISMATCH + fi } -# Shorthand for --mode=foo, only valid as the first argument -case $1 in -clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; -compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; -execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; -finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; -install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; -link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; -uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; -esac +# libtool_options_prep [ARG]... +# ----------------------------- +# Preparation for options parsed by libtool. +libtool_options_prep () +{ + $debug_mode + # Option defaults: + opt_config=false + opt_dlopen= + opt_dry_run=false + opt_help=false + opt_mode= + opt_preserve_dup_deps=false + opt_quiet=false + nonopt= + preserve_args= -# Option defaults: -opt_debug=: -opt_dry_run=false -opt_config=false -opt_preserve_dup_deps=false -opt_features=false -opt_finish=false -opt_help=false -opt_help_all=false -opt_silent=: -opt_warning=: -opt_verbose=: -opt_silent=false -opt_verbose=false + # Shorthand for --mode=foo, only valid as the first argument + case $1 in + clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; + compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; + execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; + finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; + install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; + link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; + uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; + esac + # Pass back the list of options. + func_quote_for_eval ${1+"$@"} + libtool_options_prep_result=$func_quote_for_eval_result +} +func_add_hook func_options_prep libtool_options_prep -# Parse options once, thoroughly. This comes as soon as possible in the -# script to make things like `--version' happen as quickly as we can. -{ - # this just eases exit handling - while test $# -gt 0; do - opt="$1" - shift - case $opt in - --debug|-x) opt_debug='set -x' - func_echo "enabling shell trace mode" - $opt_debug - ;; - --dry-run|--dryrun|-n) - opt_dry_run=: - ;; - --config) - opt_config=: -func_config - ;; - --dlopen|-dlopen) - optarg="$1" - opt_dlopen="${opt_dlopen+$opt_dlopen -}$optarg" - shift - ;; - --preserve-dup-deps) - opt_preserve_dup_deps=: - ;; - --features) - opt_features=: -func_features - ;; - --finish) - opt_finish=: -set dummy --mode finish ${1+"$@"}; shift - ;; - --help) - opt_help=: - ;; - --help-all) - opt_help_all=: -opt_help=': help-all' - ;; - --mode) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_mode="$optarg" -case $optarg in - # Valid mode arguments: - clean|compile|execute|finish|install|link|relink|uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; -esac - shift - ;; - --no-silent|--no-quiet) - opt_silent=false -func_append preserve_args " $opt" - ;; - --no-warning|--no-warn) - opt_warning=false -func_append preserve_args " $opt" - ;; - --no-verbose) - opt_verbose=false -func_append preserve_args " $opt" - ;; - --silent|--quiet) - opt_silent=: -func_append preserve_args " $opt" - opt_verbose=false - ;; - --verbose|-v) - opt_verbose=: -func_append preserve_args " $opt" -opt_silent=false - ;; - --tag) - test $# = 0 && func_missing_arg $opt && break - optarg="$1" - opt_tag="$optarg" -func_append preserve_args " $opt $optarg" -func_enable_tag "$optarg" - shift - ;; - - -\?|-h) func_usage ;; - --help) func_help ;; - --version) func_version ;; - - # Separate optargs to long options: - --*=*) - func_split_long_opt "$opt" - set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} - shift - ;; - - # Separate non-argument short options: - -\?*|-h*|-n*|-v*) - func_split_short_opt "$opt" - set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} - shift - ;; - - --) break ;; - -*) func_fatal_help "unrecognized option \`$opt'" ;; - *) set dummy "$opt" ${1+"$@"}; shift; break ;; - esac - done - # Validate options: +# libtool_parse_options [ARG]... +# --------------------------------- +# Provide handling for libtool specific options. +libtool_parse_options () +{ + $debug_cmd - # save first non-option argument - if test "$#" -gt 0; then - nonopt="$opt" - shift - fi + # Perform our own loop to consume as many options as possible in + # each iteration. + while test $# -gt 0; do + _G_opt=$1 + shift + case $_G_opt in + --dry-run|--dryrun|-n) + opt_dry_run=: + ;; + + --config) func_config ;; + + --dlopen|-dlopen) + opt_dlopen="${opt_dlopen+$opt_dlopen +}$1" + shift + ;; + + --preserve-dup-deps) + opt_preserve_dup_deps=: ;; + + --features) func_features ;; + + --finish) set dummy --mode finish ${1+"$@"}; shift ;; + + --help) opt_help=: ;; + + --help-all) opt_help=': help-all' ;; + + --mode) test $# = 0 && func_missing_arg $_G_opt && break + opt_mode=$1 + case $1 in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $_G_opt" + exit_cmd=exit + break + ;; + esac + shift + ;; + + --no-silent|--no-quiet) + opt_quiet=false + func_append preserve_args " $_G_opt" + ;; + + --no-warnings|--no-warning|--no-warn) + opt_warning=false + func_append preserve_args " $_G_opt" + ;; + + --no-verbose) + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --silent|--quiet) + opt_quiet=: + opt_verbose=false + func_append preserve_args " $_G_opt" + ;; + + --tag) test $# = 0 && func_missing_arg $_G_opt && break + opt_tag=$1 + func_append preserve_args " $_G_opt $1" + func_enable_tag "$1" + shift + ;; + + --verbose|-v) opt_quiet=false + opt_verbose=: + func_append preserve_args " $_G_opt" + ;; - # preserve --debug - test "$opt_debug" = : || func_append preserve_args " --debug" + # An option not handled by this hook function: + *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; + esac + done - case $host in - *cygwin* | *mingw* | *pw32* | *cegcc*) - # don't eliminate duplications in $postdeps and $predeps - opt_duplicate_compiler_generated_deps=: - ;; - *) - opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps - ;; - esac - $opt_help || { - # Sanity checks first: - func_check_version_match + # save modified positional parameters for caller + func_quote_for_eval ${1+"$@"} + libtool_parse_options_result=$func_quote_for_eval_result +} +func_add_hook func_parse_options libtool_parse_options - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" - # Only execute mode is allowed to have -dlopen flags. - if test -n "$opt_dlopen" && test "$opt_mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE +# libtool_validate_options [ARG]... +# --------------------------------- +# Perform any sanity checks on option settings and/or unconsumed +# arguments. +libtool_validate_options () +{ + # save first non-option argument + if test 0 -lt $#; then + nonopt=$1 + shift fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$opt_mode' for more information." - } + # preserve --debug + test : = "$debug_cmd" || func_append preserve_args " --debug" + + case $host in + # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 + # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 + *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) + # don't eliminate duplications in $postdeps and $predeps + opt_duplicate_compiler_generated_deps=: + ;; + *) + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps + ;; + esac + $opt_help || { + # Sanity checks first: + func_check_version_match + + test yes != "$build_libtool_libs" \ + && test yes != "$build_old_libs" \ + && func_fatal_configuration "not configured to build any kind of library" + + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" + + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test execute != "$opt_mode"; then + func_error "unrecognized option '-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi + + # Change the help message to a mode-specific one. + generic_help=$help + help="Try '$progname --help --mode=$opt_mode' for more information." + } - # Bail if the options were screwed - $exit_cmd $EXIT_FAILURE + # Pass back the unparsed argument list + func_quote_for_eval ${1+"$@"} + libtool_validate_options_result=$func_quote_for_eval_result } +func_add_hook func_validate_options libtool_validate_options + +# Process options as early as possible so that --help and --version +# can return quickly. +func_options ${1+"$@"} +eval set dummy "$func_options_result"; shift @@ -1224,24 +2468,52 @@ ## Main. ## ## ----------- ## +magic='%%%MAGIC variable%%%' +magic_exe='%%%MAGIC EXE variable%%%' + +# Global variables. +extracted_archives= +extracted_serial=0 + +# If this variable is set in any of the actions, the command in it +# will be execed at the end. This prevents here-documents from being +# left over by shells. +exec_cmd= + + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + +# func_generated_by_libtool +# True iff stdin has been generated by Libtool. This function is only +# a basic sanity check; it will hardly flush out determined imposters. +func_generated_by_libtool_p () +{ + $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 +} + # func_lalib_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function is only a basic sanity check; it will hardly flush out # determined imposters. func_lalib_p () { test -f "$1" && - $SED -e 4q "$1" 2>/dev/null \ - | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 + $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p } # func_lalib_unsafe_p file -# True iff FILE is a libtool `.la' library or `.lo' object file. +# True iff FILE is a libtool '.la' library or '.lo' object file. # This function implements the same check as func_lalib_p without # resorting to external programs. To this end, it redirects stdin and # closes it afterwards, without saving the original file descriptor. # As a safety measure, use it only where a negative result would be -# fatal anyway. Works if `file' does not exist. +# fatal anyway. Works if 'file' does not exist. func_lalib_unsafe_p () { lalib_p=no @@ -1249,13 +2521,13 @@ for lalib_p_l in 1 2 3 4 do read lalib_p_line - case "$lalib_p_line" in + case $lalib_p_line in \#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;; esac done exec 0<&5 5<&- fi - test "$lalib_p" = yes + test yes = "$lalib_p" } # func_ltwrapper_script_p file @@ -1264,7 +2536,8 @@ # determined imposters. func_ltwrapper_script_p () { - func_lalib_p "$1" + test -f "$1" && + $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p } # func_ltwrapper_executable_p file @@ -1289,7 +2562,7 @@ { func_dirname_and_basename "$1" "" "." func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" + func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper } # func_ltwrapper_p file @@ -1308,11 +2581,13 @@ # FAIL_CMD may read-access the current command in variable CMD! func_execute_cmds () { - $opt_debug + $debug_cmd + save_ifs=$IFS; IFS='~' for cmd in $1; do - IFS=$save_ifs + IFS=$sp$nl eval cmd=\"$cmd\" + IFS=$save_ifs func_show_eval "$cmd" "${2-:}" done IFS=$save_ifs @@ -1324,10 +2599,11 @@ # Note that it is not necessary on cygwin/mingw to append a dot to # FILE even if both FILE and FILE.exe exist: automatic-append-.exe # behavior happens only for exec(3), not for open(2)! Also, sourcing -# `FILE.' does not work on cygwin managed mounts. +# 'FILE.' does not work on cygwin managed mounts. func_source () { - $opt_debug + $debug_cmd + case $1 in */* | *\\*) . "$1" ;; *) . "./$1" ;; @@ -1354,10 +2630,10 @@ # store the result into func_replace_sysroot_result. func_replace_sysroot () { - case "$lt_sysroot:$1" in + case $lt_sysroot:$1 in ?*:"$lt_sysroot"*) func_stripname "$lt_sysroot" '' "$1" - func_replace_sysroot_result="=$func_stripname_result" + func_replace_sysroot_result='='$func_stripname_result ;; *) # Including no sysroot. @@ -1374,7 +2650,8 @@ # arg is usually of the form 'gcc ...' func_infer_tag () { - $opt_debug + $debug_cmd + if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -1393,7 +2670,7 @@ for z in $available_tags; do if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. @@ -1418,7 +2695,7 @@ # line option must be used. if test -z "$tagname"; then func_echo "unable to infer tagged configuration" - func_fatal_error "specify a tag with \`--tag'" + func_fatal_error "specify a tag with '--tag'" # else # func_verbose "using $tagname tagged configuration" fi @@ -1434,15 +2711,15 @@ # but don't create it if we're doing a dry run. func_write_libtool_object () { - write_libobj=${1} - if test "$build_libtool_libs" = yes; then - write_lobj=\'${2}\' + write_libobj=$1 + if test yes = "$build_libtool_libs"; then + write_lobj=\'$2\' else write_lobj=none fi - if test "$build_old_libs" = yes; then - write_oldobj=\'${3}\' + if test yes = "$build_old_libs"; then + write_oldobj=\'$3\' else write_oldobj=none fi @@ -1450,7 +2727,7 @@ $opt_dry_run || { cat >${write_libobj}T </dev/null` - if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | - $SED -e "$lt_sed_naive_backslashify"` + $SED -e "$sed_naive_backslashify"` else func_convert_core_file_wine_to_w32_result= fi @@ -1514,18 +2792,19 @@ # are convertible, then the result may be empty. func_convert_core_path_wine_to_w32 () { - $opt_debug + $debug_cmd + # unfortunately, winepath doesn't convert paths, only file names - func_convert_core_path_wine_to_w32_result="" + func_convert_core_path_wine_to_w32_result= if test -n "$1"; then oldIFS=$IFS IFS=: for func_convert_core_path_wine_to_w32_f in $1; do IFS=$oldIFS func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" - if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -n "$func_convert_core_file_wine_to_w32_result"; then if test -z "$func_convert_core_path_wine_to_w32_result"; then - func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result else func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" fi @@ -1554,7 +2833,8 @@ # environment variable; do not put it in $PATH. func_cygpath () { - $opt_debug + $debug_cmd + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` if test "$?" -ne 0; then @@ -1563,7 +2843,7 @@ fi else func_cygpath_result= - func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'" fi } #end: func_cygpath @@ -1574,10 +2854,11 @@ # result in func_convert_core_msys_to_w32_result. func_convert_core_msys_to_w32 () { - $opt_debug + $debug_cmd + # awkward: cmd appends spaces to result func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | - $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` + $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"` } #end: func_convert_core_msys_to_w32 @@ -1588,13 +2869,14 @@ # func_to_host_file_result to ARG1). func_convert_file_check () { - $opt_debug - if test -z "$2" && test -n "$1" ; then + $debug_cmd + + if test -z "$2" && test -n "$1"; then func_error "Could not determine host file name corresponding to" - func_error " \`$1'" + func_error " '$1'" func_error "Continuing, but uninstalled executables may not work." # Fallback: - func_to_host_file_result="$1" + func_to_host_file_result=$1 fi } # end func_convert_file_check @@ -1606,10 +2888,11 @@ # func_to_host_file_result to a simplistic fallback value (see below). func_convert_path_check () { - $opt_debug + $debug_cmd + if test -z "$4" && test -n "$3"; then func_error "Could not determine the host path corresponding to" - func_error " \`$3'" + func_error " '$3'" func_error "Continuing, but uninstalled executables may not work." # Fallback. This is a deliberately simplistic "conversion" and # should not be "improved". See libtool.info. @@ -1618,7 +2901,7 @@ func_to_host_path_result=`echo "$3" | $SED -e "$lt_replace_pathsep_chars"` else - func_to_host_path_result="$3" + func_to_host_path_result=$3 fi fi } @@ -1630,9 +2913,10 @@ # and appending REPL if ORIG matches BACKPAT. func_convert_path_front_back_pathsep () { - $opt_debug + $debug_cmd + case $4 in - $1 ) func_to_host_path_result="$3$func_to_host_path_result" + $1 ) func_to_host_path_result=$3$func_to_host_path_result ;; esac case $4 in @@ -1646,7 +2930,7 @@ ################################################## # $build to $host FILE NAME CONVERSION FUNCTIONS # ################################################## -# invoked via `$to_host_file_cmd ARG' +# invoked via '$to_host_file_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # Result will be available in $func_to_host_file_result. @@ -1657,7 +2941,8 @@ # in func_to_host_file_result. func_to_host_file () { - $opt_debug + $debug_cmd + $to_host_file_cmd "$1" } # end func_to_host_file @@ -1669,7 +2954,8 @@ # in (the comma separated) LAZY, no conversion takes place. func_to_tool_file () { - $opt_debug + $debug_cmd + case ,$2, in *,"$to_tool_file_cmd",*) func_to_tool_file_result=$1 @@ -1687,7 +2973,7 @@ # Copy ARG to func_to_host_file_result. func_convert_file_noop () { - func_to_host_file_result="$1" + func_to_host_file_result=$1 } # end func_convert_file_noop @@ -1698,11 +2984,12 @@ # func_to_host_file_result. func_convert_file_msys_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" - func_to_host_file_result="$func_convert_core_msys_to_w32_result" + func_to_host_file_result=$func_convert_core_msys_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1714,8 +3001,9 @@ # func_to_host_file_result. func_convert_file_cygwin_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # because $build is cygwin, we call "the" cygpath in $PATH; no need to use # LT_CYGPATH in this case. @@ -1731,11 +3019,12 @@ # and a working winepath. Returns result in func_to_host_file_result. func_convert_file_nix_to_w32 () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_file_wine_to_w32 "$1" - func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result=$func_convert_core_file_wine_to_w32_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1747,12 +3036,13 @@ # Returns result in func_to_host_file_result. func_convert_file_msys_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then func_convert_core_msys_to_w32 "$1" func_cygpath -u "$func_convert_core_msys_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1765,13 +3055,14 @@ # in func_to_host_file_result. func_convert_file_nix_to_cygwin () { - $opt_debug - func_to_host_file_result="$1" + $debug_cmd + + func_to_host_file_result=$1 if test -n "$1"; then # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. func_convert_core_file_wine_to_w32 "$1" func_cygpath -u "$func_convert_core_file_wine_to_w32_result" - func_to_host_file_result="$func_cygpath_result" + func_to_host_file_result=$func_cygpath_result fi func_convert_file_check "$1" "$func_to_host_file_result" } @@ -1781,7 +3072,7 @@ ############################################# # $build to $host PATH CONVERSION FUNCTIONS # ############################################# -# invoked via `$to_host_path_cmd ARG' +# invoked via '$to_host_path_cmd ARG' # # In each case, ARG is the path to be converted from $build to $host format. # The result will be available in $func_to_host_path_result. @@ -1805,10 +3096,11 @@ to_host_path_cmd= func_init_to_host_path_cmd () { - $opt_debug + $debug_cmd + if test -z "$to_host_path_cmd"; then func_stripname 'func_convert_file_' '' "$to_host_file_cmd" - to_host_path_cmd="func_convert_path_${func_stripname_result}" + to_host_path_cmd=func_convert_path_$func_stripname_result fi } @@ -1818,7 +3110,8 @@ # in func_to_host_path_result. func_to_host_path () { - $opt_debug + $debug_cmd + func_init_to_host_path_cmd $to_host_path_cmd "$1" } @@ -1829,7 +3122,7 @@ # Copy ARG to func_to_host_path_result. func_convert_path_noop () { - func_to_host_path_result="$1" + func_to_host_path_result=$1 } # end func_convert_path_noop @@ -1840,8 +3133,9 @@ # func_to_host_path_result. func_convert_path_msys_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from ARG. MSYS # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; @@ -1849,7 +3143,7 @@ func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_to_host_path_result=$func_convert_core_msys_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1863,8 +3157,9 @@ # func_to_host_file_result. func_convert_path_cygwin_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" @@ -1883,14 +3178,15 @@ # a working winepath. Returns result in func_to_host_file_result. func_convert_path_nix_to_w32 () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" - func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result=$func_convert_core_path_wine_to_w32_result func_convert_path_check : ";" \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" @@ -1904,15 +3200,16 @@ # Returns result in func_to_host_file_result. func_convert_path_msys_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # See func_convert_path_msys_to_w32: func_stripname : : "$1" func_to_host_path_tmp1=$func_stripname_result func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_msys_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1927,8 +3224,9 @@ # func_to_host_file_result. func_convert_path_nix_to_cygwin () { - $opt_debug - func_to_host_path_result="$1" + $debug_cmd + + func_to_host_path_result=$1 if test -n "$1"; then # Remove leading and trailing path separator characters from # ARG. msys behavior is inconsistent here, cygpath turns them @@ -1937,7 +3235,7 @@ func_to_host_path_tmp1=$func_stripname_result func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" - func_to_host_path_result="$func_cygpath_result" + func_to_host_path_result=$func_cygpath_result func_convert_path_check : : \ "$func_to_host_path_tmp1" "$func_to_host_path_result" func_convert_path_front_back_pathsep ":*" "*:" : "$1" @@ -1946,13 +3244,31 @@ # end func_convert_path_nix_to_cygwin +# func_dll_def_p FILE +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with _LT_DLL_DEF_P in libtool.m4 +func_dll_def_p () +{ + $debug_cmd + + func_dll_def_p_tmp=`$SED -n \ + -e 's/^[ ]*//' \ + -e '/^\(;.*\)*$/d' \ + -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \ + -e q \ + "$1"` + test DEF = "$func_dll_def_p_tmp" +} + + # func_mode_compile arg... func_mode_compile () { - $opt_debug + $debug_cmd + # Get the compilation command and the source file. base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" + srcfile=$nonopt # always keep a non-empty value in "srcfile" suppress_opt=yes suppress_output= arg_mode=normal @@ -1965,12 +3281,12 @@ case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile - lastarg="$arg" + lastarg=$arg arg_mode=normal ;; target ) - libobj="$arg" + libobj=$arg arg_mode=normal continue ;; @@ -1980,7 +3296,7 @@ case $arg in -o) test -n "$libobj" && \ - func_fatal_error "you cannot specify \`-o' more than once" + func_fatal_error "you cannot specify '-o' more than once" arg_mode=target continue ;; @@ -2009,12 +3325,12 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result lastarg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for arg in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_append_quoted lastarg "$arg" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result @@ -2027,8 +3343,8 @@ # Accept the current argument as the source file. # The previous "srcfile" becomes the current argument. # - lastarg="$srcfile" - srcfile="$arg" + lastarg=$srcfile + srcfile=$arg ;; esac # case $arg ;; @@ -2043,13 +3359,13 @@ func_fatal_error "you must specify an argument for -Xcompile" ;; target) - func_fatal_error "you must specify a target with \`-o'" + func_fatal_error "you must specify a target with '-o'" ;; *) # Get the name of the library object. test -z "$libobj" && { func_basename "$srcfile" - libobj="$func_basename_result" + libobj=$func_basename_result } ;; esac @@ -2069,7 +3385,7 @@ case $libobj in *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;; *) - func_fatal_error "cannot determine name of library object from \`$libobj'" + func_fatal_error "cannot determine name of library object from '$libobj'" ;; esac @@ -2078,8 +3394,8 @@ for arg in $later; do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes = "$build_libtool_libs" \ + || func_fatal_configuration "cannot build a shared library" build_old_libs=no continue ;; @@ -2105,17 +3421,17 @@ func_quote_for_eval "$libobj" test "X$libobj" != "X$func_quote_for_eval_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ - && func_warning "libobj name \`$libobj' may not contain shell special characters." + && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" - objname="$func_basename_result" - xdir="$func_dirname_result" - lobj=${xdir}$objdir/$objname + objname=$func_basename_result + xdir=$func_dirname_result + lobj=$xdir$objdir/$objname test -z "$base_compile" && \ func_fatal_help "you must specify a compilation command" # Delete any leftover library objects. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then removelist="$obj $lobj $libobj ${libobj}T" else removelist="$lobj $libobj ${libobj}T" @@ -2127,16 +3443,16 @@ pic_mode=default ;; esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then + if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then # non-PIC code in shared libraries is not supported pic_mode=default fi # 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} - lockfile="$output_obj.lock" + if test no = "$compiler_c_o"; then + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext + lockfile=$output_obj.lock else output_obj= need_locks=no @@ -2145,12 +3461,12 @@ # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then + if test yes = "$need_locks"; then until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do func_echo "Waiting for $lockfile to be removed" sleep 2 done - elif test "$need_locks" = warn; then + elif test warn = "$need_locks"; then if test -f "$lockfile"; then $ECHO "\ *** ERROR, $lockfile exists and contains: @@ -2158,7 +3474,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2180,11 +3496,11 @@ qsrcfile=$func_quote_for_eval_result # Only build a PIC object if we are building libtool libraries. - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Without this assignment, base_compile gets emptied. fbsd_hideous_sh_bug=$base_compile - if test "$pic_mode" != no; then + if test no != "$pic_mode"; then command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code @@ -2201,7 +3517,7 @@ func_show_eval_locale "$command" \ 'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2212,7 +3528,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2228,20 +3544,20 @@ fi # Allow error messages only from the first compilation. - if test "$suppress_opt" = yes; then + if test yes = "$suppress_opt"; then suppress_output=' >/dev/null 2>&1' fi fi # Only build a position-dependent object if we build old libraries. - if test "$build_old_libs" = yes; then - if test "$pic_mode" != yes; then + if test yes = "$build_old_libs"; then + if test yes != "$pic_mode"; then # Don't build PIC code command="$base_compile $qsrcfile$pie_flag" else command="$base_compile $qsrcfile $pic_flag" fi - if test "$compiler_c_o" = yes; then + if test yes = "$compiler_c_o"; then func_append command " -o $obj" fi @@ -2250,7 +3566,7 @@ func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' - if test "$need_locks" = warn && + if test warn = "$need_locks" && test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then $ECHO "\ *** ERROR, $lockfile contains: @@ -2261,7 +3577,7 @@ This indicates that another process is trying to use the same temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you +your compiler does not support '-c' and '-o' together. If you repeat this compilation, it may succeed, by chance, but you had better avoid parallel builds (make -j) in this platform, or get a better compiler." @@ -2281,7 +3597,7 @@ func_write_libtool_object "$libobj" "$objdir/$objname" "$objname" # Unlock the critical section if it was locked - if test "$need_locks" != no; then + if test no != "$need_locks"; then removelist=$lockfile $RM "$lockfile" fi @@ -2291,7 +3607,7 @@ } $opt_help || { - test "$opt_mode" = compile && func_mode_compile ${1+"$@"} + test compile = "$opt_mode" && func_mode_compile ${1+"$@"} } func_mode_help () @@ -2311,7 +3627,7 @@ Remove files from the build directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, object or program, all the files associated @@ -2330,16 +3646,16 @@ -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 - -shared do not build a \`.o' file suitable for static linking - -static only build a \`.o' file suitable for static linking + -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 +COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." +SOURCEFILE, then substituting the C source code suffix '.c' with the +library object suffix, '.lo'." ;; execute) @@ -2352,7 +3668,7 @@ -dlopen FILE add the directory containing FILE to the library path -This mode sets the library path environment variable according to \`-dlopen' +This mode sets the library path environment variable according to '-dlopen' flags. If any of the ARGS are libtool executable wrappers, then they are translated @@ -2371,7 +3687,7 @@ Each LIBDIR is a directory that contains libtool libraries. The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." +the '--dry-run' option if you just want to see what would be executed." ;; install) @@ -2381,7 +3697,7 @@ Install executables or libraries. INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. +either the 'install' or 'cp' program. The following components of INSTALL-COMMAND are treated specially: @@ -2407,7 +3723,7 @@ -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 + -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) -export-symbols SYMFILE @@ -2421,7 +3737,8 @@ -no-install link a not-installable executable -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects + -objectlist FILE use a list of object files found in FILE to specify objects + -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes) -precious-files-regex REGEX don't remove output files matching REGEX -release RELEASE specify package release information @@ -2441,20 +3758,20 @@ -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. +All other options (arguments beginning with '-') are ignored. -Every other argument is treated as a filename. Files ending in \`.la' are +Every other argument is treated as a filename. Files ending in '.la' are treated as uninstalled libtool libraries, other files are standard or library object files. -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is +If the OUTPUT-FILE ends in '.la', then a libtool library is created, +only library objects ('.lo' files) may be specified, and '-rpath' is required, except when creating a convenience library. -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. +If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created +using 'ar' and 'ranlib', or on Windows using 'lib'. -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file +If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file is created, otherwise an executable program is created." ;; @@ -2465,7 +3782,7 @@ Remove libraries from an installation directory. RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed +(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed to RM. If FILE is a libtool library, all the files associated with it are deleted. @@ -2473,17 +3790,17 @@ ;; *) - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" ;; esac echo - $ECHO "Try \`$progname --help' for more information about other modes." + $ECHO "Try '$progname --help' for more information about other modes." } # Now that we've collected a possible --mode arg, show help if necessary if $opt_help; then - if test "$opt_help" = :; then + if test : = "$opt_help"; then func_mode_help else { @@ -2491,7 +3808,7 @@ for opt_mode in compile link execute install finish uninstall clean; do func_mode_help done - } | sed -n '1p; 2,$s/^Usage:/ or: /p' + } | $SED -n '1p; 2,$s/^Usage:/ or: /p' { func_help noexit for opt_mode in compile link execute install finish uninstall clean; do @@ -2499,7 +3816,7 @@ func_mode_help done } | - sed '1d + $SED '1d /^When reporting/,/^Report/{ H d @@ -2516,16 +3833,17 @@ # func_mode_execute arg... func_mode_execute () { - $opt_debug + $debug_cmd + # The first argument is the command name. - cmd="$nonopt" + cmd=$nonopt test -z "$cmd" && \ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. for file in $opt_dlopen; do test -f "$file" \ - || func_fatal_help "\`$file' is not a file" + || func_fatal_help "'$file' is not a file" dir= case $file in @@ -2535,7 +3853,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$lib' is not a valid libtool archive" + || func_fatal_help "'$lib' is not a valid libtool archive" # Read the libtool library. dlname= @@ -2546,18 +3864,18 @@ if test -z "$dlname"; then # Warn if it was a shared library. test -n "$library_names" && \ - func_warning "\`$file' was not linked with \`-export-dynamic'" + func_warning "'$file' was not linked with '-export-dynamic'" continue fi func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result if test -f "$dir/$objdir/$dlname"; then func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then - func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" + func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'" fi fi ;; @@ -2565,18 +3883,18 @@ *.lo) # Just add the directory containing the .lo file. func_dirname "$file" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result ;; *) - func_warning "\`-dlopen' is ignored for non-libtool libraries and objects" + func_warning "'-dlopen' is ignored for non-libtool libraries and objects" continue ;; esac # Get the absolute pathname. absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" + test -n "$absdir" && dir=$absdir # Now add the directory to shlibpath_var. if eval "test -z \"\$$shlibpath_var\""; then @@ -2588,7 +3906,7 @@ # This variable tells wrapper scripts just to set shlibpath_var # rather than running their programs. - libtool_execute_magic="$magic" + libtool_execute_magic=$magic # Check if any of the arguments is a wrapper script. args= @@ -2601,12 +3919,12 @@ if func_ltwrapper_script_p "$file"; then func_source "$file" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program elif func_ltwrapper_executable_p "$file"; then func_ltwrapper_scriptname "$file" func_source "$func_ltwrapper_scriptname_result" # Transform arg to wrapped name. - file="$progdir/$program" + file=$progdir/$program fi ;; esac @@ -2614,7 +3932,15 @@ func_append_quoted args "$file" done - if test "X$opt_dry_run" = Xfalse; then + if $opt_dry_run; then + # Display what would be done. + if test -n "$shlibpath_var"; then + eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" + echo "export $shlibpath_var" + fi + $ECHO "$cmd$args" + exit $EXIT_SUCCESS + else if test -n "$shlibpath_var"; then # Export the shlibpath_var. eval "export $shlibpath_var" @@ -2631,25 +3957,18 @@ done # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - echo "export $shlibpath_var" - fi - $ECHO "$cmd$args" - exit $EXIT_SUCCESS + exec_cmd=\$cmd$args fi } -test "$opt_mode" = execute && func_mode_execute ${1+"$@"} +test execute = "$opt_mode" && func_mode_execute ${1+"$@"} # func_mode_finish arg... func_mode_finish () { - $opt_debug + $debug_cmd + libs= libdirs= admincmds= @@ -2663,11 +3982,11 @@ if func_lalib_unsafe_p "$opt"; then func_append libs " $opt" else - func_warning "\`$opt' is not a valid libtool archive" + func_warning "'$opt' is not a valid libtool archive" fi else - func_fatal_error "invalid argument \`$opt'" + func_fatal_error "invalid argument '$opt'" fi done @@ -2682,12 +4001,12 @@ # Remove sysroot references if $opt_dry_run; then for lib in $libs; do - echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + echo "removing references to $lt_sysroot and '=' prefixes from $lib" done else tmpdir=`func_mktempdir` for lib in $libs; do - sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ > $tmpdir/tmp-la mv -f $tmpdir/tmp-la $lib done @@ -2712,7 +4031,7 @@ fi # Exit here if they wanted silent mode. - $opt_silent && exit $EXIT_SUCCESS + $opt_quiet && exit $EXIT_SUCCESS if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then echo "----------------------------------------------------------------------" @@ -2723,27 +4042,27 @@ 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 "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 " - 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 " - add LIBDIR to the '$runpath_var' environment variable" echo " during linking" fi if test -n "$hardcode_libdir_flag_spec"; then libdir=LIBDIR eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" + $ECHO " - use the '$flag' linker flag" fi if test -n "$admincmds"; then $ECHO " - have your system administrator run these commands:$admincmds" fi if test -f /etc/ld.so.conf; then - echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'" fi echo @@ -2762,18 +4081,20 @@ exit $EXIT_SUCCESS } -test "$opt_mode" = finish && func_mode_finish ${1+"$@"} +test finish = "$opt_mode" && func_mode_finish ${1+"$@"} # func_mode_install arg... func_mode_install () { - $opt_debug + $debug_cmd + # There may be an optional sh(1) argument at the beginning of # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || + if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" || # Allow the use of GNU shtool's install command. - case $nonopt in *shtool*) :;; *) false;; esac; then + case $nonopt in *shtool*) :;; *) false;; esac + then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -2800,7 +4121,7 @@ opts= prev= install_type= - isdir=no + isdir=false stripme= no_mode=: for arg @@ -2813,7 +4134,7 @@ fi case $arg in - -d) isdir=yes ;; + -d) isdir=: ;; -f) if $install_cp; then :; else prev=$arg @@ -2831,7 +4152,7 @@ *) # 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 + if test X-m = "X$prev" && test -n "$install_override_mode"; then arg2=$install_override_mode no_mode=false fi @@ -2856,7 +4177,7 @@ func_fatal_help "you must specify an install program" test -n "$prev" && \ - func_fatal_help "the \`$prev' option requires an argument" + func_fatal_help "the '$prev' option requires an argument" if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else @@ -2878,19 +4199,19 @@ dest=$func_stripname_result # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" + test -d "$dest" && isdir=: + if $isdir; then + destdir=$dest destname= else func_dirname_and_basename "$dest" "" "." - destdir="$func_dirname_result" - destname="$func_basename_result" + destdir=$func_dirname_result + destname=$func_basename_result # Not a directory, so check to see that there is only one file specified. set dummy $files; shift test "$#" -gt 1 && \ - func_fatal_help "\`$dest' is not a directory" + func_fatal_help "'$dest' is not a directory" fi case $destdir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -2899,7 +4220,7 @@ case $file in *.lo) ;; *) - func_fatal_help "\`$destdir' must be an absolute directory name" + func_fatal_help "'$destdir' must be an absolute directory name" ;; esac done @@ -2908,7 +4229,7 @@ # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic staticlibs= future_libdirs= @@ -2928,7 +4249,7 @@ # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ - || func_fatal_help "\`$file' is not a valid libtool archive" + || func_fatal_help "'$file' is not a valid libtool archive" library_names= old_library= @@ -2950,7 +4271,7 @@ fi func_dirname "$file" "/" "" - dir="$func_dirname_result" + dir=$func_dirname_result func_append dir "$objdir" if test -n "$relink_command"; then @@ -2964,7 +4285,7 @@ # are installed into $libdir/../bin (currently, that works fine) # but it's something to keep an eye on. test "$inst_prefix_dir" = "$destdir" && \ - func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir" + func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. @@ -2973,29 +4294,36 @@ relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi - func_warning "relinking \`$file'" + func_warning "relinking '$file'" func_show_eval "$relink_command" \ - 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"' + 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"' fi # See the names of the shared library. set dummy $library_names; shift if test -n "$1"; then - realname="$1" + realname=$1 shift - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + srcname=$realname + 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" \ 'exit $?' - tstripme="$stripme" + tstripme=$stripme case $host_os in cygwin* | mingw* | pw32* | cegcc*) case $realname in *.dll.a) - tstripme="" + tstripme= + ;; + esac + ;; + os2*) + case $realname in + *_dll.a) + tstripme= ;; esac ;; @@ -3006,7 +4334,7 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. - # Try `ln -sf' first, because the `ln' binary might depend on + # Try 'ln -sf' first, because the 'ln' binary might depend on # the symlink we replace! Solaris /bin/ln does not understand -f, # so we also need to try rm && ln -s. for linkname @@ -3017,14 +4345,14 @@ fi # Do each command in the postinstall commands. - lib="$destdir/$realname" + lib=$destdir/$realname func_execute_cmds "$postinstall_cmds" 'exit $?' fi # Install the pseudo-library for information purposes. func_basename "$file" - name="$func_basename_result" - instname="$dir/$name"i + name=$func_basename_result + instname=$dir/${name}i func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. @@ -3036,11 +4364,11 @@ # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # Deduce the name of the destination old-style object file. @@ -3050,11 +4378,11 @@ staticdest=$func_lo2o_result ;; *.$objext) - staticdest="$destfile" + staticdest=$destfile destfile= ;; *) - func_fatal_help "cannot copy a libtool object to \`$destfile'" + func_fatal_help "cannot copy a libtool object to '$destfile'" ;; esac @@ -3063,7 +4391,7 @@ func_show_eval "$install_prog $file $destfile" 'exit $?' # Install the old object if enabled. - if test "$build_old_libs" = yes; then + if test yes = "$build_old_libs"; then # Deduce the name of the old-style object file. func_lo2o "$file" staticobj=$func_lo2o_result @@ -3075,23 +4403,23 @@ *) # Figure out destination file name, if it wasn't already specified. if test -n "$destname"; then - destfile="$destdir/$destname" + destfile=$destdir/$destname else func_basename "$file" - destfile="$func_basename_result" - destfile="$destdir/$destfile" + destfile=$func_basename_result + destfile=$destdir/$destfile fi # If the file is missing, and there is a .exe on the end, strip it # because it is most likely a libtool script we actually want to # install - stripped_ext="" + stripped_ext= case $file in *.exe) if test ! -f "$file"; then func_stripname '' '.exe' "$file" file=$func_stripname_result - stripped_ext=".exe" + stripped_ext=.exe fi ;; esac @@ -3119,19 +4447,19 @@ # Check the variables that should have been set. test -z "$generated_by_libtool_version" && \ - func_fatal_error "invalid libtool wrapper script \`$wrapper'" + func_fatal_error "invalid libtool wrapper script '$wrapper'" - finalize=yes + finalize=: for lib in $notinst_deplibs; do # Check to see that each library is installed. libdir= if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'` if test -n "$libdir" && test ! -f "$libfile"; then - func_warning "\`$lib' has not been installed in \`$libdir'" - finalize=no + func_warning "'$lib' has not been installed in '$libdir'" + finalize=false fi done @@ -3139,29 +4467,29 @@ func_source "$wrapper" outputname= - if test "$fast_install" = no && test -n "$relink_command"; then + if test no = "$fast_install" && test -n "$relink_command"; then $opt_dry_run || { - if test "$finalize" = yes; then + if $finalize; then tmpdir=`func_mktempdir` func_basename "$file$stripped_ext" - file="$func_basename_result" - outputname="$tmpdir/$file" + file=$func_basename_result + outputname=$tmpdir/$file # Replace the output file specification. relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` - $opt_silent || { + $opt_quiet || { func_quote_for_expand "$relink_command" eval "func_echo $func_quote_for_expand_result" } if eval "$relink_command"; then : else - func_error "error: relink \`$file' with the above command before installing it" + func_error "error: relink '$file' with the above command before installing it" $opt_dry_run || ${RM}r "$tmpdir" continue fi - file="$outputname" + file=$outputname else - func_warning "cannot relink \`$file'" + func_warning "cannot relink '$file'" fi } else @@ -3198,10 +4526,10 @@ for file in $staticlibs; do func_basename "$file" - name="$func_basename_result" + name=$func_basename_result # Set up the ranlib parameters. - oldlib="$destdir/$name" + oldlib=$destdir/$name func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 tool_oldlib=$func_to_tool_file_result @@ -3216,18 +4544,18 @@ done test -n "$future_libdirs" && \ - func_warning "remember to run \`$progname --finish$future_libdirs'" + func_warning "remember to run '$progname --finish$future_libdirs'" if test -n "$current_libdirs"; then # Maybe just do a dry run. $opt_dry_run && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' + exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs' else exit $EXIT_SUCCESS fi } -test "$opt_mode" = install && func_mode_install ${1+"$@"} +test install = "$opt_mode" && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -3235,16 +4563,17 @@ # a dlpreopen symbol table. func_generate_dlsyms () { - $opt_debug - my_outputname="$1" - my_originator="$2" - my_pic_p="${3-no}" - my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'` + $debug_cmd + + my_outputname=$1 + my_originator=$2 + my_pic_p=${3-false} + my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'` my_dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then if test -n "$NM" && test -n "$global_symbol_pipe"; then - my_dlsyms="${my_outputname}S.c" + my_dlsyms=${my_outputname}S.c else func_error "not configured to extract global symbols from dlpreopened files" fi @@ -3255,7 +4584,7 @@ "") ;; *.c) # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${my_outputname}.nm" + nlist=$output_objdir/$my_outputname.nm func_show_eval "$RM $nlist ${nlist}S ${nlist}T" @@ -3263,34 +4592,36 @@ func_verbose "creating $output_objdir/$my_dlsyms" $opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\ -/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */ -/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */ +/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */ +/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */ #ifdef __cplusplus extern \"C\" { #endif -#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) #pragma GCC diagnostic ignored \"-Wstrict-prototypes\" #endif /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else # define LT_DLSYM_CONST const #endif +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* External symbol declarations for the compiler. */\ " - if test "$dlself" = yes; then - func_verbose "generating symbol list for \`$output'" + if test yes = "$dlself"; then + func_verbose "generating symbol list for '$output'" $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" @@ -3298,7 +4629,7 @@ progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do func_to_tool_file "$progfile" func_convert_file_msys_to_w32 - func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + func_verbose "extracting global C symbols from '$func_to_tool_file_result'" $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done @@ -3318,10 +4649,10 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$outputname.exp" + export_symbols=$output_objdir/$outputname.exp $opt_dry_run || { $RM $export_symbols - eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' case $host in *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' @@ -3331,7 +4662,7 @@ } else $opt_dry_run || { - eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in @@ -3345,22 +4676,22 @@ fi for dlprefile in $dlprefiles; do - func_verbose "extracting global C symbols from \`$dlprefile'" + func_verbose "extracting global C symbols from '$dlprefile'" func_basename "$dlprefile" - name="$func_basename_result" + name=$func_basename_result case $host in *cygwin* | *mingw* | *cegcc* ) # if an import library, we need to obtain dlname if func_win32_import_lib_p "$dlprefile"; then func_tr_sh "$dlprefile" eval "curr_lafile=\$libfile_$func_tr_sh_result" - dlprefile_dlbasename="" + dlprefile_dlbasename= if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then # Use subshell, to avoid clobbering current variable values dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` - if test -n "$dlprefile_dlname" ; then + if test -n "$dlprefile_dlname"; then func_basename "$dlprefile_dlname" - dlprefile_dlbasename="$func_basename_result" + dlprefile_dlbasename=$func_basename_result else # no lafile. user explicitly requested -dlpreopen . $sharedlib_from_linklib_cmd "$dlprefile" @@ -3368,7 +4699,7 @@ fi fi $opt_dry_run || { - if test -n "$dlprefile_dlbasename" ; then + if test -n "$dlprefile_dlbasename"; then eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' else func_warning "Could not compute DLL name from $name" @@ -3424,6 +4755,11 @@ echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi + func_show_eval '$RM "${nlist}I"' + if test -n "$global_symbol_to_import"; then + eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I' + fi + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ @@ -3432,11 +4768,30 @@ void *address; } lt_dlsymlist; extern LT_DLSYM_CONST lt_dlsymlist -lt_${my_prefix}_LTX_preloaded_symbols[]; +lt_${my_prefix}_LTX_preloaded_symbols[];\ +" + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ +static void lt_syminit(void) +{ + LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols; + for (; symbol->name; ++symbol) + {" + $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms" + echo >> "$output_objdir/$my_dlsyms" "\ + } +}" + fi + echo >> "$output_objdir/$my_dlsyms" "\ LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = -{\ - { \"$my_originator\", (void *) 0 }," +{ {\"$my_originator\", (void *) 0}," + + if test -s "$nlist"I; then + echo >> "$output_objdir/$my_dlsyms" "\ + {\"@INIT@\", (void *) <_syminit}," + fi case $need_lib_prefix in no) @@ -3478,9 +4833,7 @@ *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; *) - if test "X$my_pic_p" != Xno; then - pic_flag_for_symtable=" $pic_flag" - fi + $my_pic_p && pic_flag_for_symtable=" $pic_flag" ;; esac ;; @@ -3497,10 +4850,10 @@ func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?' # Clean up the generated files. - func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"' + func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"' # Transform the symbol file into the correct name. - symfileobj="$output_objdir/${my_outputname}S.$objext" + symfileobj=$output_objdir/${my_outputname}S.$objext case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then @@ -3518,7 +4871,7 @@ esac ;; *) - func_fatal_error "unknown suffix for \`$my_dlsyms'" + func_fatal_error "unknown suffix for '$my_dlsyms'" ;; esac else @@ -3532,6 +4885,32 @@ fi } +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $debug_cmd + + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + # func_win32_libid arg # return the library type of file 'arg' # @@ -3541,8 +4920,9 @@ # Despite the name, also deal with 64 bit binaries. func_win32_libid () { - $opt_debug - win32_libid_type="unknown" + $debug_cmd + + win32_libid_type=unknown win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in *ar\ archive\ import\ library*) # definitely import @@ -3552,16 +4932,29 @@ # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then - func_to_tool_file "$1" func_convert_file_msys_to_w32 - win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | - $SED -n -e ' + case $nm_interface in + "MS dumpbin") + if func_cygming_ms_implib_p "$1" || + func_cygming_gnu_implib_p "$1" + then + win32_nmres=import + else + win32_nmres= + fi + ;; + *) + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | + $SED -n -e ' 1,100{ / I /{ - s,.*,import, + s|.*|import| p q } }'` + ;; + esac case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -3593,7 +4986,8 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib () { - $opt_debug + $debug_cmd + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` } @@ -3610,7 +5004,8 @@ # specified import library. func_cygming_dll_for_implib_fallback_core () { - $opt_debug + $debug_cmd + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` $OBJDUMP -s --section "$1" "$2" 2>/dev/null | $SED '/^Contents of section '"$match_literal"':/{ @@ -3646,8 +5041,8 @@ /./p' | # we now have a list, one entry per line, of the stringified # contents of the appropriate section of all members of the - # archive which possess that section. Heuristic: eliminate - # all those which have a first or second character that is + # archive that possess that section. Heuristic: eliminate + # all those that have a first or second character that is # a '.' (that is, objdump's representation of an unprintable # character.) This should work for all archives with less than # 0x302f exports -- but will fail for DLLs whose name actually @@ -3658,30 +5053,6 @@ $SED -e '/^\./d;/^.\./d;q' } -# func_cygming_gnu_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is a GNU/binutils-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_gnu_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` - test -n "$func_cygming_gnu_implib_tmp" -} - -# func_cygming_ms_implib_p ARG -# This predicate returns with zero status (TRUE) if -# ARG is an MS-style import library. Returns -# with nonzero status (FALSE) otherwise. -func_cygming_ms_implib_p () -{ - $opt_debug - func_to_tool_file "$1" func_convert_file_msys_to_w32 - func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` - test -n "$func_cygming_ms_implib_tmp" -} - # func_cygming_dll_for_implib_fallback ARG # Platform-specific function to extract the # name of the DLL associated with the specified @@ -3695,16 +5066,17 @@ # $sharedlib_from_linklib_result func_cygming_dll_for_implib_fallback () { - $opt_debug - if func_cygming_gnu_implib_p "$1" ; then + $debug_cmd + + if func_cygming_gnu_implib_p "$1"; then # binutils import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` - elif func_cygming_ms_implib_p "$1" ; then + elif func_cygming_ms_implib_p "$1"; then # ms-generated import library sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` else # unknown - sharedlib_from_linklib_result="" + sharedlib_from_linklib_result= fi } @@ -3712,10 +5084,11 @@ # func_extract_an_archive dir oldlib func_extract_an_archive () { - $opt_debug - f_ex_an_ar_dir="$1"; shift - f_ex_an_ar_oldlib="$1" - if test "$lock_old_archive_extraction" = yes; then + $debug_cmd + + f_ex_an_ar_dir=$1; shift + f_ex_an_ar_oldlib=$1 + if test yes = "$lock_old_archive_extraction"; 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" @@ -3724,7 +5097,7 @@ 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 + if test yes = "$lock_old_archive_extraction"; then $opt_dry_run || rm -f "$lockfile" fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then @@ -3738,22 +5111,23 @@ # func_extract_archives gentop oldlib ... func_extract_archives () { - $opt_debug - my_gentop="$1"; shift + $debug_cmd + + my_gentop=$1; shift my_oldlibs=${1+"$@"} - my_oldobjs="" - my_xlib="" - my_xabs="" - my_xdir="" + my_oldobjs= + my_xlib= + my_xabs= + my_xdir= for my_xlib in $my_oldlibs; do # Extract the objects. case $my_xlib in - [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;; *) my_xabs=`pwd`"/$my_xlib" ;; esac func_basename "$my_xlib" - my_xlib="$func_basename_result" + my_xlib=$func_basename_result my_xlib_u=$my_xlib while :; do case " $extracted_archives " in @@ -3765,7 +5139,7 @@ esac done extracted_archives="$extracted_archives $my_xlib_u" - my_xdir="$my_gentop/$my_xlib_u" + my_xdir=$my_gentop/$my_xlib_u func_mkdir_p "$my_xdir" @@ -3778,22 +5152,23 @@ cd $my_xdir || exit $? darwin_archive=$my_xabs darwin_curdir=`pwd` - darwin_base_archive=`basename "$darwin_archive"` + func_basename "$darwin_archive" + darwin_base_archive=$func_basename_result darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true` if test -n "$darwin_arches"; then darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'` darwin_arch= func_verbose "$darwin_base_archive has multiple architectures $darwin_arches" - for darwin_arch in $darwin_arches ; do - func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}" - $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" - cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" - func_extract_an_archive "`pwd`" "${darwin_base_archive}" + for darwin_arch in $darwin_arches; do + func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch" + $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive" + cd "unfat-$$/$darwin_base_archive-$darwin_arch" + func_extract_an_archive "`pwd`" "$darwin_base_archive" cd "$darwin_curdir" - $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" done # $darwin_arches ## Okay now we've a bunch of thin objects, gotta fatten them up :) - darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u` + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u` darwin_file= darwin_files= for darwin_file in $darwin_filelist; do @@ -3815,7 +5190,7 @@ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done - func_extract_archives_result="$my_oldobjs" + func_extract_archives_result=$my_oldobjs } @@ -3830,7 +5205,7 @@ # # 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 +# will assume that the directory where it is stored is # the $objdir directory. This is a cygwin/mingw-specific # behavior. func_emit_wrapper () @@ -3841,7 +5216,7 @@ #! $SHELL # $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # The $output program cannot be directly executed until all the libtool # libraries that it depends on are installed. @@ -3898,9 +5273,9 @@ # 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 +# /script/ and the wrapper /executable/ that is used only on # windows platforms, and (c) all begin with the string "--lt-" -# (application programs are unlikely to have options which match +# (application programs are unlikely to have options that match # this pattern). # # There are only two supported options: --lt-debug and @@ -3933,7 +5308,7 @@ # Print the debug banner immediately: if test -n \"\$lt_option_debug\"; then - echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2 fi } @@ -3944,7 +5319,7 @@ lt_dump_args_N=1; for lt_arg do - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\" lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` done } @@ -3958,7 +5333,7 @@ *-*-mingw | *-*-os2* | *-cegcc*) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} @@ -3968,7 +5343,7 @@ *) $ECHO "\ if test -n \"\$lt_option_debug\"; then - \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2 func_lt_dump_args \${1+\"\$@\"} 1>&2 fi exec \"\$progdir/\$program\" \${1+\"\$@\"} @@ -4043,13 +5418,13 @@ test -n \"\$absdir\" && thisdir=\"\$absdir\" " - if test "$fast_install" = yes; then + if test yes = "$fast_install"; then $ECHO "\ program=lt-'$outputname'$exeext progdir=\"\$thisdir/$objdir\" if test ! -f \"\$progdir/\$program\" || - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ + { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\ test \"X\$file\" != \"X\$progdir/\$program\"; }; then file=\"\$\$-\$program\" @@ -4066,7 +5441,7 @@ if test -n \"\$relink_command\"; then if relink_command_output=\`eval \$relink_command 2>&1\`; then : else - $ECHO \"\$relink_command_output\" >&2 + \$ECHO \"\$relink_command_output\" >&2 $RM \"\$progdir/\$file\" exit 1 fi @@ -4101,7 +5476,7 @@ fi # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then + if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ # Add our own library path to $shlibpath_var $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" @@ -4121,7 +5496,7 @@ fi else # The program doesn't exist. - \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 + \$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 exit 1 @@ -4140,7 +5515,7 @@ cat < #include +#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0) + /* declarations of non-ANSI functions */ -#if defined(__MINGW32__) +#if defined __MINGW32__ # ifdef __STRICT_ANSI__ int _putenv (const char *); # endif -#elif defined(__CYGWIN__) +#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) ... */ +/* #elif defined other_platform || defined ... */ #endif /* portability defines, excluding path handling macros */ -#if defined(_MSC_VER) +#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__) +#elif defined __MINGW32__ # define setmode _setmode # define stat _stat # define chmod _chmod # define getcwd _getcwd # define putenv _putenv -#elif defined(__CYGWIN__) +#elif defined __CYGWIN__ # define HAVE_SETENV # define FOPEN_WB "wb" -/* #elif defined (other platforms) ... */ +/* #elif defined other platforms ... */ #endif -#if defined(PATH_MAX) +#if defined PATH_MAX # define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) +#elif defined MAXPATHLEN # define LT_PATHMAX MAXPATHLEN #else # define LT_PATHMAX 1024 @@ -4234,8 +5607,8 @@ # define PATH_SEPARATOR ':' #endif -#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \ - defined (__OS2__) +#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \ + defined __OS2__ # define HAVE_DOS_BASED_FILE_SYSTEM # define FOPEN_WB "wb" # ifndef DIR_SEPARATOR_2 @@ -4268,10 +5641,10 @@ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) #define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ + if (stale) { free (stale); stale = 0; } \ } while (0) -#if defined(LT_DEBUGWRAPPER) +#if defined LT_DEBUGWRAPPER static int lt_debug = 1; #else static int lt_debug = 0; @@ -4300,11 +5673,16 @@ EOF cat < 0) && IS_PATH_SEPARATOR (new_value[len-1])) + size_t len = strlen (new_value); + while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1])) { - new_value[len-1] = '\0'; + new_value[--len] = '\0'; } lt_setenv (name, new_value); XFREE (new_value); @@ -5082,27 +6460,47 @@ # True if ARG is an import lib, as indicated by $file_magic_cmd func_win32_import_lib_p () { - $opt_debug + $debug_cmd + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in *import*) : ;; *) false ;; esac } +# func_suncc_cstd_abi +# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!! +# Several compiler flags select an ABI that is incompatible with the +# Cstd library. Avoid specifying it if any are in CXXFLAGS. +func_suncc_cstd_abi () +{ + $debug_cmd + + case " $compile_command " in + *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*) + suncc_use_cstd_abi=no + ;; + *) + suncc_use_cstd_abi=yes + ;; + esac +} + # func_mode_link arg... func_mode_link () { - $opt_debug + $debug_cmd + case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) # It is impossible to link a dll without this setting, and # we shouldn't force the makefile maintainer to figure out - # which system we are compiling for in order to pass an extra + # what system we are compiling for in order to pass an extra # flag for every libtool invocation. # allow_undefined=no # FIXME: Unfortunately, there are problems with the above when trying - # to make a dll which has undefined symbols, in which case not + # to make a dll that has undefined symbols, in which case not # even a static library is built. For now, we need to specify # -no-undefined on the libtool link line when we can be certain # that all symbols are satisfied, otherwise we get a static library. @@ -5146,10 +6544,11 @@ module=no no_install=no objs= + os2dllname= non_pic_objects= precious_files_regex= prefer_static_libs=no - preload=no + preload=false prev= prevarg= release= @@ -5161,7 +6560,7 @@ vinfo= vinfo_number=no weak_libs= - single_module="${wl}-single_module" + single_module=$wl-single_module func_infer_tag $base_compile # We need to know -static, to get the right output filenames. @@ -5169,15 +6568,15 @@ do case $arg in -shared) - test "$build_libtool_libs" != yes && \ - func_fatal_configuration "can not build a shared library" + test yes != "$build_libtool_libs" \ + && func_fatal_configuration "cannot build a shared library" build_old_libs=no break ;; -all-static | -static | -static-libtool-libs) case $arg in -all-static) - if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then + if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then func_warning "complete static linking is impossible in this configuration" fi if test -n "$link_static_flag"; then @@ -5210,7 +6609,7 @@ # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do - arg="$1" + arg=$1 shift func_quote_for_eval "$arg" qarg=$func_quote_for_eval_unquoted_result @@ -5227,21 +6626,21 @@ case $prev in bindir) - bindir="$arg" + bindir=$arg prev= continue ;; dlfiles|dlprefiles) - if test "$preload" = no; then + $preload || { # Add the symbol object into the linking commands. func_append compile_command " @SYMFILE@" func_append finalize_command " @SYMFILE@" - preload=yes - fi + preload=: + } case $arg in *.la | *.lo) ;; # We handle these cases below. force) - if test "$dlself" = no; then + if test no = "$dlself"; then dlself=needless export_dynamic=yes fi @@ -5249,9 +6648,9 @@ continue ;; self) - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then + elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then dlself=yes else dlself=needless @@ -5261,7 +6660,7 @@ continue ;; *) - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then func_append dlfiles " $arg" else func_append dlprefiles " $arg" @@ -5272,14 +6671,14 @@ esac ;; expsyms) - export_symbols="$arg" + export_symbols=$arg test -f "$arg" \ - || func_fatal_error "symbol file \`$arg' does not exist" + || func_fatal_error "symbol file '$arg' does not exist" prev= continue ;; expsyms_regex) - export_symbols_regex="$arg" + export_symbols_regex=$arg prev= continue ;; @@ -5297,7 +6696,13 @@ continue ;; inst_prefix) - inst_prefix_dir="$arg" + inst_prefix_dir=$arg + prev= + continue + ;; + mllvm) + # Clang does not use LLVM to link, so we can simply discard any + # '-mllvm $arg' options when doing the link step. prev= continue ;; @@ -5321,21 +6726,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + if test none != "$pic_object"; then # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5346,7 +6751,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5354,23 +6759,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" + arg=$pic_object fi # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5378,7 +6783,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5386,24 +6791,29 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi done else - func_fatal_error "link input file \`$arg' does not exist" + func_fatal_error "link input file '$arg' does not exist" fi arg=$save_arg prev= continue ;; + os2dllname) + os2dllname=$arg + prev= + continue + ;; precious_regex) - precious_files_regex="$arg" + precious_files_regex=$arg prev= continue ;; release) - release="-$arg" + release=-$arg prev= continue ;; @@ -5415,7 +6825,7 @@ func_fatal_error "only absolute run-paths are allowed" ;; esac - if test "$prev" = rpath; then + if test rpath = "$prev"; then case "$rpath " in *" $arg "*) ;; *) func_append rpath " $arg" ;; @@ -5430,7 +6840,7 @@ continue ;; shrext) - shrext_cmds="$arg" + shrext_cmds=$arg prev= continue ;; @@ -5470,7 +6880,7 @@ esac fi # test -n "$prev" - prevarg="$arg" + prevarg=$arg case $arg in -all-static) @@ -5484,7 +6894,7 @@ -allow-undefined) # FIXME: remove this flag sometime in the future. - func_fatal_error "\`-allow-undefined' must not be used because it is the default" + func_fatal_error "'-allow-undefined' must not be used because it is the default" ;; -avoid-version) @@ -5516,7 +6926,7 @@ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then func_fatal_error "more than one -exported-symbols argument is not allowed" fi - if test "X$arg" = "X-export-symbols"; then + if test X-export-symbols = "X$arg"; then prev=expsyms else prev=expsyms_regex @@ -5550,9 +6960,9 @@ func_stripname "-L" '' "$arg" if test -z "$func_stripname_result"; then if test "$#" -gt 0; then - func_fatal_error "require no space between \`-L' and \`$1'" + func_fatal_error "require no space between '-L' and '$1'" else - func_fatal_error "need path for \`-L' option" + func_fatal_error "need path for '-L' option" fi fi func_resolve_sysroot "$func_stripname_result" @@ -5563,8 +6973,8 @@ *) absdir=`cd "$dir" && pwd` test -z "$absdir" && \ - func_fatal_error "cannot determine absolute directory name of \`$dir'" - dir="$absdir" + func_fatal_error "cannot determine absolute directory name of '$dir'" + dir=$absdir ;; esac case "$deplibs " in @@ -5599,7 +7009,7 @@ ;; -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then + if test X-lc = "X$arg" || test X-lm = "X$arg"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) @@ -5607,11 +7017,11 @@ ;; *-*-os2*) # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework @@ -5620,16 +7030,16 @@ ;; *-*-sco3.2v5* | *-*-sco5v6*) # Causes problems with __ctype - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work - test "X$arg" = "X-lc" && continue + test X-lc = "X$arg" && continue ;; esac - elif test "X$arg" = "X-lc_r"; then + elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -5639,6 +7049,11 @@ continue ;; + -mllvm) + prev=mllvm + continue + ;; + -module) module=yes continue @@ -5668,7 +7083,7 @@ ;; -multi_module) - single_module="${wl}-multi_module" + single_module=$wl-multi_module continue ;; @@ -5682,8 +7097,8 @@ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*) # The PATH hackery in wrapper scripts is required on Windows # and Darwin in order for the loader to find any dlls it needs. - func_warning "\`-no-install' is ignored for $host" - func_warning "assuming \`-no-fast-install' instead" + func_warning "'-no-install' is ignored for $host" + func_warning "assuming '-no-fast-install' instead" fast_install=no ;; *) no_install=yes ;; @@ -5701,6 +7116,11 @@ continue ;; + -os2dllname) + prev=os2dllname + continue + ;; + -o) prev=output ;; -precious-files-regex) @@ -5788,14 +7208,14 @@ func_stripname '-Wc,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $func_quote_for_eval_result" func_append compiler_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5804,15 +7224,15 @@ func_stripname '-Wl,' '' "$arg" args=$func_stripname_result arg= - save_ifs="$IFS"; IFS=',' + save_ifs=$IFS; IFS=, for flag in $args; do - IFS="$save_ifs" + IFS=$save_ifs func_quote_for_eval "$flag" func_append arg " $wl$func_quote_for_eval_result" func_append compiler_flags " $wl$func_quote_for_eval_result" func_append linker_flags " $func_quote_for_eval_result" done - IFS="$save_ifs" + IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; @@ -5835,7 +7255,7 @@ # -msg_* for osf cc -msg_*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; # Flags to be passed through unchanged, with rationale: @@ -5847,25 +7267,46 @@ # -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 + # -fstack-protector* stack protector flags for GCC # @file GCC response files # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-flto*|-fwhopr*|-fuse-linker-plugin) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" continue ;; + -Z*) + if test os2 = "`expr $host : '.*\(os2\)'`"; then + # OS/2 uses -Zxxx to specify OS/2-specific options + compiler_flags="$compiler_flags $arg" + func_append compile_command " $arg" + func_append finalize_command " $arg" + case $arg in + -Zlinker | -Zstack) + prev=xcompiler + ;; + esac + continue + else + # Otherwise treat like 'Some other compiler flag' below + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + fi + ;; + # Some other compiler flag. -* | +*) func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; *.$objext) @@ -5886,21 +7327,21 @@ if test -z "$pic_object" || test -z "$non_pic_object" || - test "$pic_object" = none && - test "$non_pic_object" = none; then - func_fatal_error "cannot find name of object for \`$arg'" + test none = "$pic_object" && + test none = "$non_pic_object"; then + func_fatal_error "cannot find name of object for '$arg'" fi # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result - if test "$pic_object" != none; then + test none = "$pic_object" || { # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" + pic_object=$xdir$pic_object - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then + if test dlfiles = "$prev"; then + if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then func_append dlfiles " $pic_object" prev= continue @@ -5911,7 +7352,7 @@ fi # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then + if test dlprefiles = "$prev"; then # Preload the old-style object. func_append dlprefiles " $pic_object" prev= @@ -5919,23 +7360,23 @@ # A PIC object. func_append libobjs " $pic_object" - arg="$pic_object" - fi + arg=$pic_object + } # Non-PIC object. - if test "$non_pic_object" != none; then + if test none != "$non_pic_object"; then # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" + non_pic_object=$xdir$non_pic_object # A standard non-PIC object func_append non_pic_objects " $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" + if test -z "$pic_object" || test none = "$pic_object"; then + arg=$non_pic_object fi else # If the PIC object exists, use it instead. # $xdir was prepended to $pic_object above. - non_pic_object="$pic_object" + non_pic_object=$pic_object func_append non_pic_objects " $non_pic_object" fi else @@ -5943,7 +7384,7 @@ if $opt_dry_run; then # Extract subdirectory from the argument. func_dirname "$arg" "/" "" - xdir="$func_dirname_result" + xdir=$func_dirname_result func_lo2o "$arg" pic_object=$xdir$objdir/$func_lo2o_result @@ -5951,7 +7392,7 @@ func_append libobjs " $pic_object" func_append non_pic_objects " $non_pic_object" else - func_fatal_error "\`$arg' is not a valid libtool object" + func_fatal_error "'$arg' is not a valid libtool object" fi fi ;; @@ -5967,11 +7408,11 @@ # A libtool-controlled library. func_resolve_sysroot "$arg" - if test "$prev" = dlfiles; then + if test dlfiles = "$prev"; then # This library was specified with -dlopen. func_append dlfiles " $func_resolve_sysroot_result" prev= - elif test "$prev" = dlprefiles; then + elif test dlprefiles = "$prev"; then # The library was specified with -dlpreopen. func_append dlprefiles " $func_resolve_sysroot_result" prev= @@ -5986,7 +7427,7 @@ # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" + arg=$func_quote_for_eval_result ;; esac # arg @@ -5998,9 +7439,9 @@ done # argument parsing loop test -n "$prev" && \ - func_fatal_help "the \`$prevarg' option requires an argument" + func_fatal_help "the '$prevarg' option requires an argument" - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then + if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then eval arg=\"$export_dynamic_flag_spec\" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6009,20 +7450,23 @@ oldlibs= # calculate the name of the file, without its directory func_basename "$output" - outputname="$func_basename_result" - libobjs_save="$libobjs" + outputname=$func_basename_result + libobjs_save=$libobjs 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 \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi eval sys_lib_search_path=\"$sys_lib_search_path_spec\" eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" + # Definition is injected by LT_CONFIG during libtool generation. + func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH" + func_dirname "$output" "/" "" - output_objdir="$func_dirname_result$objdir" + output_objdir=$func_dirname_result$objdir func_to_tool_file "$output_objdir/" tool_output_objdir=$func_to_tool_file_result # Create the object directory. @@ -6045,7 +7489,7 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6053,7 +7497,7 @@ func_append libs " $deplib" done - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then libs="$predeps $libs $compiler_lib_search_path $postdeps" # Compute libraries that are listed more than once in $predeps @@ -6085,7 +7529,7 @@ case $file in *.la) ;; *) - func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file" + func_fatal_help "libraries can '-dlopen' only libtool libraries: $file" ;; esac done @@ -6093,7 +7537,7 @@ prog) compile_deplibs= finalize_deplibs= - alldeplibs=no + alldeplibs=false newdlfiles= newdlprefiles= passes="conv scan dlopen dlpreopen link" @@ -6105,29 +7549,29 @@ for pass in $passes; do # The preopen pass in lib mode reverses $deplibs; put it back here # so that -L comes before libs that need it for instance... - if test "$linkmode,$pass" = "lib,link"; then + if test lib,link = "$linkmode,$pass"; then ## FIXME: Find the place where the list is rebuilt in the wrong ## order, and fix it there properly tmp_deplibs= for deplib in $deplibs; do tmp_deplibs="$deplib $tmp_deplibs" done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs fi - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass"; then + libs=$deplibs deplibs= fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; + dlopen) libs=$dlfiles ;; + dlpreopen) libs=$dlprefiles ;; link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi - if test "$linkmode,$pass" = "lib,dlpreopen"; then + if test lib,dlpreopen = "$linkmode,$pass"; then # Collect and forward deplibs of preopened libtool libs for lib in $dlprefiles; do # Ignore non-libtool-libs @@ -6148,26 +7592,26 @@ esac done done - libs="$dlprefiles" + libs=$dlprefiles fi - if test "$pass" = dlopen; then + if test dlopen = "$pass"; then # Collect dlpreopened libraries - save_deplibs="$deplibs" + save_deplibs=$deplibs deplibs= fi for deplib in $libs; do lib= - found=no + found=false case $deplib in -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else func_append compiler_flags " $deplib" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6177,13 +7621,13 @@ continue ;; -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - func_warning "\`-l' is ignored for archives/objects" + if test lib != "$linkmode" && test prog != "$linkmode"; then + func_warning "'-l' is ignored for archives/objects" continue fi func_stripname '-l' '' "$deplib" name=$func_stripname_result - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path" else searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path" @@ -6191,31 +7635,22 @@ for searchdir in $searchdirs; do for search_ext in .la $std_shrext .so .a; do # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" + lib=$searchdir/lib$name$search_ext if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes + if test .la = "$search_ext"; then + found=: else - found=no + found=false fi break 2 fi done done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library + if $found; then + # deplib is a libtool library # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $deplib "*) if func_lalib_p "$lib"; then @@ -6223,19 +7658,19 @@ old_library= func_source "$lib" for l in $old_library $library_names; do - ll="$l" + ll=$l done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no + if test "X$ll" = "X$old_library"; then # only static version available + found=false func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" fi continue fi @@ -6244,15 +7679,25 @@ *) ;; esac fi + else + # deplib doesn't seem to be a libtool library + if test prog,link = "$linkmode,$pass"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs" + fi + continue fi ;; # -l *.ltframework) - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else deplibs="$deplib $deplibs" - if test "$linkmode" = lib ; then + if test lib = "$linkmode"; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; * ) func_append new_inherited_linker_flags " $deplib" ;; @@ -6265,18 +7710,18 @@ case $linkmode in lib) deplibs="$deplib $deplibs" - test "$pass" = conv && continue + test conv = "$pass" && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" func_resolve_sysroot "$func_stripname_result" func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi - if test "$pass" = scan; then + if test scan = "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6287,13 +7732,13 @@ func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) - func_warning "\`-L' is ignored for archives/objects" + func_warning "'-L' is ignored for archives/objects" ;; esac # linkmode continue ;; # -L -R*) - if test "$pass" = link; then + if test link = "$pass"; then func_stripname '-R' '' "$deplib" func_resolve_sysroot "$func_stripname_result" dir=$func_resolve_sysroot_result @@ -6311,7 +7756,7 @@ lib=$func_resolve_sysroot_result ;; *.$libext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" continue fi @@ -6322,21 +7767,26 @@ case " $dlpreconveniencelibs " in *" $deplib "*) ;; *) - valid_a_lib=no + valid_a_lib=false case $deplibs_check_method in 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 \ | $EGREP "$match_pattern_regex" > /dev/null; then - valid_a_lib=yes + valid_a_lib=: fi ;; pass_all) - valid_a_lib=yes + valid_a_lib=: ;; esac - if test "$valid_a_lib" != yes; then + if $valid_a_lib; then + echo + $ECHO "*** Warning: Linking the shared library $output against the" + $ECHO "*** static library $deplib is not portable!" + deplibs="$deplib $deplibs" + else echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." echo "*** I have the capability to make that library automatically link in when" @@ -6344,18 +7794,13 @@ 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 "*** Warning: Linking the shared library $output against the" - $ECHO "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" fi ;; esac continue ;; prog) - if test "$pass" != link; then + if test link != "$pass"; then deplibs="$deplib $deplibs" else compile_deplibs="$deplib $compile_deplibs" @@ -6366,10 +7811,10 @@ esac # linkmode ;; # *.$libext *.lo | *.$objext) - if test "$pass" = conv; then + if test conv = "$pass"; then deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + elif test prog = "$linkmode"; then + if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then # If there is no dlopen support or we're linking statically, # we need to preload. func_append newdlprefiles " $deplib" @@ -6382,22 +7827,20 @@ continue ;; %DEPLIBS%) - alldeplibs=yes + alldeplibs=: continue ;; esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'" - fi + $found || test -f "$lib" \ + || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'" # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$lib" \ - || func_fatal_error "\`$lib' is not a valid libtool archive" + || func_fatal_error "'$lib' is not a valid libtool archive" func_dirname "$lib" "" "." - ladir="$func_dirname_result" + ladir=$func_dirname_result dlname= dlopen= @@ -6427,30 +7870,30 @@ done fi dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then + if test lib,link = "$linkmode,$pass" || + test prog,scan = "$linkmode,$pass" || + { test prog != "$linkmode" && test lib != "$linkmode"; }; then test -n "$dlopen" && func_append dlfiles " $dlopen" test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi - if test "$pass" = conv; then + if test conv = "$pass"; then # Only check for convenience libraries deplibs="$lib $deplibs" if test -z "$libdir"; then if test -z "$old_library"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" - elif test "$linkmode" != prog && test "$linkmode" != lib; then - func_fatal_error "\`$lib' is not a convenience library" + elif test prog != "$linkmode" && test lib != "$linkmode"; then + func_fatal_error "'$lib' is not a convenience library" fi tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6464,26 +7907,26 @@ # Get the name of the library we link against. linklib= if test -n "$old_library" && - { test "$prefer_static_libs" = yes || - test "$prefer_static_libs,$installed" = "built,no"; }; then + { test yes = "$prefer_static_libs" || + test built,no = "$prefer_static_libs,$installed"; }; then linklib=$old_library else for l in $old_library $library_names; do - linklib="$l" + linklib=$l done fi if test -z "$linklib"; then - func_fatal_error "cannot find name of link library for \`$lib'" + func_fatal_error "cannot find name of link library for '$lib'" fi # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - func_fatal_error "cannot -dlopen a convenience library: \`$lib'" - fi + if test dlopen = "$pass"; then + test -z "$libdir" \ + && func_fatal_error "cannot -dlopen a convenience library: '$lib'" if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then + test yes != "$dlopen_support" || + test no = "$build_libtool_libs" + then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -6497,40 +7940,40 @@ # We need an absolute path. case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;; *) abs_ladir=`cd "$ladir" && pwd` if test -z "$abs_ladir"; then - func_warning "cannot determine absolute directory name of \`$ladir'" + func_warning "cannot determine absolute directory name of '$ladir'" func_warning "passing it literally to the linker, although it might fail" - abs_ladir="$ladir" + abs_ladir=$ladir fi ;; esac func_basename "$lib" - laname="$func_basename_result" + laname=$func_basename_result # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then + if test yes = "$installed"; then if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - func_warning "library \`$lib' was moved." - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" + func_warning "library '$lib' was moved." + dir=$ladir + absdir=$abs_ladir + libdir=$abs_ladir else - dir="$lt_sysroot$libdir" - absdir="$lt_sysroot$libdir" + dir=$lt_sysroot$libdir + absdir=$lt_sysroot$libdir fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes + test yes = "$hardcode_automatic" && avoidtemprpath=yes else if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then - dir="$ladir" - absdir="$abs_ladir" + dir=$ladir + absdir=$abs_ladir # Remove this search path later func_append notinst_path " $abs_ladir" else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" + dir=$ladir/$objdir + absdir=$abs_ladir/$objdir # Remove this search path later func_append notinst_path " $abs_ladir" fi @@ -6539,11 +7982,11 @@ name=$func_stripname_result # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir" && test "$linkmode" = prog; then - func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" + if test dlpreopen = "$pass"; then + if test -z "$libdir" && test prog = "$linkmode"; then + func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'" fi - case "$host" in + case $host in # special handling for platforms with PE-DLLs. *cygwin* | *mingw* | *cegcc* ) # Linker will automatically link against shared library if both @@ -6587,9 +8030,9 @@ if test -z "$libdir"; then # Link the convenience library - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then + elif test prog,link = "$linkmode,$pass"; then compile_deplibs="$dir/$old_library $compile_deplibs" finalize_deplibs="$dir/$old_library $finalize_deplibs" else @@ -6599,14 +8042,14 @@ fi - if test "$linkmode" = prog && test "$pass" != link; then + if test prog = "$linkmode" && test link != "$pass"; then func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes + linkalldeplibs=false + if test no != "$link_all_deplibs" || test -z "$library_names" || + test no = "$build_libtool_libs"; then + linkalldeplibs=: fi tmp_libs= @@ -6618,14 +8061,14 @@ ;; esac # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then + if $linkalldeplibs; then deplibs="$deplib $deplibs" else # Need to hardcode shared library paths # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac @@ -6635,15 +8078,15 @@ continue fi # $linkmode = prog... - if test "$linkmode,$pass" = "prog,link"; then + if test prog,link = "$linkmode,$pass"; then if test -n "$library_names" && - { { test "$prefer_static_libs" = no || - test "$prefer_static_libs,$installed" = "built,yes"; } || + { { test no = "$prefer_static_libs" || + test built,yes = "$prefer_static_libs,$installed"; } || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath:" in + case $temp_rpath: in *"$absdir:"*) ;; *) func_append temp_rpath "$absdir:" ;; esac @@ -6672,9 +8115,9 @@ esac fi # $linkmode,$pass = prog,link... - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && + if $alldeplibs && + { test pass_all = "$deplibs_check_method" || + { test yes = "$build_libtool_libs" && test -n "$library_names"; }; }; then # We only need to search for static libraries continue @@ -6683,19 +8126,19 @@ link_static=no # Whether the deplib will be linked statically use_static_libs=$prefer_static_libs - if test "$use_static_libs" = built && test "$installed" = yes; then + if test built = "$use_static_libs" && test yes = "$installed"; then use_static_libs=no fi if test -n "$library_names" && - { test "$use_static_libs" = no || test -z "$old_library"; }; then + { test no = "$use_static_libs" || test -z "$old_library"; }; then case $host in - *cygwin* | *mingw* | *cegcc*) + *cygwin* | *mingw* | *cegcc* | *os2*) # No point in relinking DLLs because paths are not encoded func_append notinst_deplibs " $lib" need_relink=no ;; *) - if test "$installed" = no; then + if test no = "$installed"; then func_append notinst_deplibs " $lib" need_relink=yes fi @@ -6705,24 +8148,24 @@ # Warn about portability, can't link against -module's on some # systems (darwin). Don't bleat about dlopened modules though! - dlopenmodule="" + dlopenmodule= for dlpremoduletest in $dlprefiles; do if test "X$dlpremoduletest" = "X$lib"; then - dlopenmodule="$dlpremoduletest" + dlopenmodule=$dlpremoduletest break fi done - if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then + if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then echo - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else $ECHO "*** Warning: Linking the shared library $output against the loadable module" fi $ECHO "*** $linklib is not portable!" fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then + if test lib = "$linkmode" && + test yes = "$hardcode_into_libs"; then # Hardcode the library path. # Skip directories that are in the system default run-time # search path. @@ -6750,43 +8193,43 @@ # figure out the soname set dummy $library_names shift - realname="$1" + realname=$1 shift libname=`eval "\\$ECHO \"$libname_spec\""` # use dlname if we got it. it's perfectly good, no? if test -n "$dlname"; then - soname="$dlname" + soname=$dlname elif test -n "$soname_spec"; then # bleh windows case $host in - *cygwin* | mingw* | *cegcc*) + *cygwin* | mingw* | *cegcc* | *os2*) func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; esac eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" + soroot=$soname func_basename "$soroot" - soname="$func_basename_result" + soname=$func_basename_result func_stripname 'lib' '.dll' "$soname" newlib=libimp-$func_stripname_result.a # If the library has no export list, then create one now if test -f "$output_objdir/$soname-def"; then : else - func_verbose "extracting exported symbol list from \`$soname'" + func_verbose "extracting exported symbol list from '$soname'" func_execute_cmds "$extract_expsyms_cmds" 'exit $?' fi # Create $newlib if test -f "$output_objdir/$newlib"; then :; else - func_verbose "generating import library for \`$soname'" + func_verbose "generating import library for '$soname'" func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?' fi # make sure the library variables are pointing to the new library @@ -6794,58 +8237,58 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$opt_mode" != relink; then + if test prog = "$linkmode" || test relink != "$opt_mode"; then add_shlibpath= add_dir= add= lib_linked=yes case $hardcode_action in immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" + if test no = "$hardcode_direct"; then + add=$dir/$linklib case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; - *-*-sysv4*uw2*) add_dir="-L$dir" ;; + *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;; + *-*-sysv4*uw2*) add_dir=-L$dir ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ - *-*-unixware7*) add_dir="-L$dir" ;; + *-*-unixware7*) add_dir=-L$dir ;; *-*-darwin* ) - # if the lib is a (non-dlopened) module then we can not + # if the lib is a (non-dlopened) module then we cannot # link against it, someone is ignoring the earlier warnings if /usr/bin/file -L $add 2> /dev/null | - $GREP ": [^:]* bundle" >/dev/null ; then + $GREP ": [^:]* bundle" >/dev/null; then if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then + 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" else - add="$dir/$old_library" + add=$dir/$old_library fi elif test -n "$old_library"; then - add="$dir/$old_library" + add=$dir/$old_library fi fi esac - elif test "$hardcode_minus_L" = no; then + elif test no = "$hardcode_minus_L"; then case $host in - *-*-sunos*) add_shlibpath="$dir" ;; + *-*-sunos*) add_shlibpath=$dir ;; esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" + add_dir=-L$dir + add=-l$name + elif test no = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi ;; relink) - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$absdir" + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$dir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$absdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6854,10 +8297,10 @@ ;; esac fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then + add_shlibpath=$dir + add=-l$name else lib_linked=no fi @@ -6865,7 +8308,7 @@ *) lib_linked=no ;; esac - if test "$lib_linked" != yes; then + if test yes != "$lib_linked"; then func_fatal_configuration "unsupported hardcode properties" fi @@ -6875,15 +8318,15 @@ *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" test -n "$add" && compile_deplibs="$add $compile_deplibs" else test -n "$add_dir" && deplibs="$add_dir $deplibs" test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && - test "$hardcode_minus_L" != yes && - test "$hardcode_shlibpath_var" = yes; then + if test yes != "$hardcode_direct" && + test yes != "$hardcode_minus_L" && + test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; @@ -6892,33 +8335,33 @@ fi fi - if test "$linkmode" = prog || test "$opt_mode" = relink; then + if test prog = "$linkmode" || test relink = "$opt_mode"; then add_shlibpath= add_dir= add= # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes && - test "$hardcode_direct_absolute" = no; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then + if test yes = "$hardcode_direct" && + test no = "$hardcode_direct_absolute"; then + add=$libdir/$linklib + elif test yes = "$hardcode_minus_L"; then + add_dir=-L$libdir + add=-l$name + elif test yes = "$hardcode_shlibpath_var"; then case :$finalize_shlibpath: in *":$libdir:"*) ;; *) func_append finalize_shlibpath "$libdir:" ;; esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then + add=-l$name + elif test yes = "$hardcode_automatic"; then if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" + test -f "$inst_prefix_dir$libdir/$linklib"; then + add=$inst_prefix_dir$libdir/$linklib else - add="$libdir/$linklib" + add=$libdir/$linklib fi else # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" + add_dir=-L$libdir # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -6927,10 +8370,10 @@ ;; esac fi - add="-l$name" + add=-l$name fi - if test "$linkmode" = prog; then + if test prog = "$linkmode"; then test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" test -n "$add" && finalize_deplibs="$add $finalize_deplibs" else @@ -6938,43 +8381,43 @@ test -n "$add" && deplibs="$add $deplibs" fi fi - elif test "$linkmode" = prog; then + elif test prog = "$linkmode"; then # Here we assume that one of hardcode_direct or hardcode_minus_L # is not unsupported. This is valid on all known static and # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" + if test unsupported != "$hardcode_direct"; then + test -n "$old_library" && linklib=$old_library compile_deplibs="$dir/$linklib $compile_deplibs" finalize_deplibs="$dir/$linklib $finalize_deplibs" else compile_deplibs="-l$name -L$dir $compile_deplibs" finalize_deplibs="-l$name -L$dir $finalize_deplibs" fi - elif test "$build_libtool_libs" = yes; then + elif test yes = "$build_libtool_libs"; then # Not a shared library - if test "$deplibs_check_method" != pass_all; then + if test pass_all != "$deplibs_check_method"; then # We're trying link a shared library against a static one # but the system doesn't support it. # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. echo - $ECHO "*** Warning: This system can not link to static lib archive $lib." + $ECHO "*** Warning: This system cannot 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." - if test "$module" = yes; then + if test yes = "$module"; 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." 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 "*** 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 "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then + if test no = "$build_old_libs"; then build_libtool_libs=module build_old_libs=yes else @@ -6987,11 +8430,11 @@ fi fi # link shared/static library? - if test "$linkmode" = lib; then + if test lib = "$linkmode"; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then + { test yes != "$hardcode_into_libs" || + test yes = "$build_old_libs" || + test yes = "$link_static"; }; then # Extract -R from dependency_libs temp_deplibs= for libdir in $dependency_libs; do @@ -7005,12 +8448,12 @@ *) func_append temp_deplibs " $libdir";; esac done - dependency_libs="$temp_deplibs" + dependency_libs=$temp_deplibs fi func_append newlib_search_path " $absdir" # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" + test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do @@ -7020,7 +8463,7 @@ func_resolve_sysroot "$func_stripname_result";; *) func_resolve_sysroot "$deplib" ;; esac - if $opt_preserve_dup_deps ; then + if $opt_preserve_dup_deps; then case "$tmp_libs " in *" $func_resolve_sysroot_result "*) func_append specialdeplibs " $func_resolve_sysroot_result" ;; @@ -7029,12 +8472,12 @@ func_append tmp_libs " $func_resolve_sysroot_result" done - if test "$link_all_deplibs" != no; then + if test no != "$link_all_deplibs"; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do path= case $deplib in - -L*) path="$deplib" ;; + -L*) path=$deplib ;; *.la) func_resolve_sysroot "$deplib" deplib=$func_resolve_sysroot_result @@ -7042,12 +8485,12 @@ dir=$func_dirname_result # We need an absolute path. case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; + [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;; *) absdir=`cd "$dir" && pwd` if test -z "$absdir"; then - func_warning "cannot determine absolute directory name of \`$dir'" - absdir="$dir" + func_warning "cannot determine absolute directory name of '$dir'" + absdir=$dir fi ;; esac @@ -7055,35 +8498,35 @@ case $host in *-*-darwin*) depdepl= - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do + eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` + if test -n "$deplibrary_names"; then + for tmp in $deplibrary_names; do depdepl=$tmp done - if test -f "$absdir/$objdir/$depdepl" ; then - depdepl="$absdir/$objdir/$depdepl" - darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + if test -f "$absdir/$objdir/$depdepl"; then + depdepl=$absdir/$objdir/$depdepl + darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` if test -z "$darwin_install_name"; then - darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` + darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl" + func_append linker_flags " -dylib_file $darwin_install_name:$depdepl" path= fi fi ;; *) - path="-L$absdir/$objdir" + path=-L$absdir/$objdir ;; esac else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" test "$absdir" != "$libdir" && \ - func_warning "\`$deplib' seems to be moved" + func_warning "'$deplib' seems to be moved" - path="-L$absdir" + path=-L$absdir fi ;; esac @@ -7095,23 +8538,23 @@ fi # link_all_deplibs != no fi # linkmode = lib done # for deplib in $libs - if test "$pass" = link; then - if test "$linkmode" = "prog"; then + if test link = "$pass"; then + if test prog = "$linkmode"; then 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'` fi fi - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then + dependency_libs=$newdependency_libs + if test dlpreopen = "$pass"; then # Link the dlpreopened libraries before other libraries for deplib in $save_deplibs; do deplibs="$deplib $deplibs" done fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then + if test dlopen != "$pass"; then + test conv = "$pass" || { # Make sure lib_search_path contains only unique directories. lib_search_path= for dir in $newlib_search_path; do @@ -7121,12 +8564,12 @@ esac done newlib_search_path= - fi + } - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else + if test prog,link = "$linkmode,$pass"; then vars="compile_deplibs finalize_deplibs" + else + vars=deplibs fi for var in $vars dependency_libs; do # Add libraries to $var in reverse order @@ -7184,62 +8627,93 @@ eval $var=\"$tmp_libs\" done # for var fi + + # Add Sun CC postdeps if required: + test CXX = "$tagname" && { + case $host_os in + linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C++ 5.9 + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + + solaris*) + func_cc_basename "$CC" + case $func_cc_basename_result in + CC* | sunCC*) + func_suncc_cstd_abi + + if test no != "$suncc_use_cstd_abi"; then + func_append postdeps ' -library=Cstd -library=Crun' + fi + ;; + esac + ;; + esac + } + # Last step: remove runtime libs from dependency_libs # (they stay in deplibs) tmp_libs= - for i in $dependency_libs ; do + for i in $dependency_libs; do case " $predeps $postdeps $compiler_lib_search_path " in *" $i "*) - i="" + i= ;; esac - if test -n "$i" ; then + if test -n "$i"; then func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" + if test prog = "$linkmode"; then + dlfiles=$newdlfiles fi - if test "$linkmode" = prog || test "$linkmode" = lib; then - dlprefiles="$newdlprefiles" + if test prog = "$linkmode" || test lib = "$linkmode"; then + dlprefiles=$newdlprefiles fi case $linkmode in oldlib) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for archives" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for archives" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for archives" ;; + func_warning "'-l' and '-L' are ignored for archives" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for archives" + func_warning "'-rpath' is ignored for archives" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for archives" + func_warning "'-R' is ignored for archives" test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for archives" + func_warning "'-version-info/-version-number' is ignored for archives" test -n "$release" && \ - func_warning "\`-release' is ignored for archives" + func_warning "'-release' is ignored for archives" test -n "$export_symbols$export_symbols_regex" && \ - func_warning "\`-export-symbols' is ignored for archives" + func_warning "'-export-symbols' is ignored for archives" # Now set the variables for building old libraries. build_libtool_libs=no - oldlibs="$output" + oldlibs=$output func_append objs "$old_deplibs" ;; lib) - # Make sure we only generate libraries of the form `libNAME.la'. + # Make sure we only generate libraries of the form 'libNAME.la'. case $outputname in lib*) func_stripname 'lib' '.la' "$outputname" @@ -7248,10 +8722,10 @@ eval libname=\"$libname_spec\" ;; *) - test "$module" = no && \ - func_fatal_help "libtool library \`$output' must begin with \`lib'" + test no = "$module" \ + && func_fatal_help "libtool library '$output' must begin with 'lib'" - if test "$need_lib_prefix" != no; then + if test no != "$need_lib_prefix"; then # Add the "lib" prefix for modules if required func_stripname '' '.la' "$outputname" name=$func_stripname_result @@ -7265,8 +8739,8 @@ esac if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" + if test pass_all != "$deplibs_check_method"; then + func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs" else echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" @@ -7275,21 +8749,21 @@ fi fi - test "$dlself" != no && \ - func_warning "\`-dlopen self' is ignored for libtool libraries" + test no = "$dlself" \ + || func_warning "'-dlopen self' is ignored for libtool libraries" set dummy $rpath shift - test "$#" -gt 1 && \ - func_warning "ignoring multiple \`-rpath's for a libtool library" + test 1 -lt "$#" \ + && func_warning "ignoring multiple '-rpath's for a libtool library" - install_libdir="$1" + install_libdir=$1 oldlibs= if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so + # Some compilers have problems with a '.al' extension so # convenience libraries should have the same extension an # archive normally would. oldlibs="$output_objdir/$libname.$libext $oldlibs" @@ -7298,20 +8772,20 @@ fi test -n "$vinfo" && \ - func_warning "\`-version-info/-version-number' is ignored for convenience libraries" + func_warning "'-version-info/-version-number' is ignored for convenience libraries" test -n "$release" && \ - func_warning "\`-release' is ignored for convenience libraries" + func_warning "'-release' is ignored for convenience libraries" else # Parse the version information argument. - save_ifs="$IFS"; IFS=':' + save_ifs=$IFS; IFS=: set dummy $vinfo 0 0 0 shift - IFS="$save_ifs" + IFS=$save_ifs test -n "$7" && \ - func_fatal_help "too many parameters to \`-version-info'" + func_fatal_help "too many parameters to '-version-info'" # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts @@ -7319,42 +8793,42 @@ case $vinfo_number in yes) - number_major="$1" - number_minor="$2" - number_revision="$3" + number_major=$1 + number_minor=$2 + number_revision=$3 # # There are really only two kinds -- those that # use the current revision as the major version # and those that subtract age and use age as # a minor version. But, then there is irix - # which has an extra 1 added just for fun + # that has an extra 1 added just for fun # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|linux|osf|windows|none) + darwin|freebsd-elf|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_revision" + age=$number_minor + revision=$number_revision ;; - freebsd-aout|freebsd-elf|qnx|sunos) - current="$number_major" - revision="$number_minor" - age="0" + freebsd-aout|qnx|sunos) + current=$number_major + revision=$number_minor + age=0 ;; irix|nonstopux) func_arith $number_major + $number_minor current=$func_arith_result - age="$number_minor" - revision="$number_minor" + age=$number_minor + revision=$number_minor lt_irix_increment=no ;; esac ;; no) - current="$1" - revision="$2" - age="$3" + current=$1 + revision=$2 + age=$3 ;; esac @@ -7362,30 +8836,30 @@ case $current in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "CURRENT \`$current' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "CURRENT '$current' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $revision in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "REVISION \`$revision' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "REVISION '$revision' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac case $age in 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - func_error "AGE \`$age' must be a nonnegative integer" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' must be a nonnegative integer" + func_fatal_error "'$vinfo' is not valid version information" ;; esac if test "$age" -gt "$current"; then - func_error "AGE \`$age' is greater than the current interface number \`$current'" - func_fatal_error "\`$vinfo' is not valid version information" + func_error "AGE '$age' is greater than the current interface number '$current'" + func_fatal_error "'$vinfo' is not valid version information" fi # Calculate the version variables. @@ -7400,26 +8874,36 @@ # verstring for coding it into the library header func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision # Darwin ld doesn't like 0 for these options... func_arith $current + 1 minor_current=$func_arith_result - xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + # On Darwin other compilers + case $CC in + nagfor*) + verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision" + ;; + *) + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + ;; + esac ;; freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; + major=.$current + versuffix=.$current.$revision ;; freebsd-elf) - major=".$current" - versuffix=".$current" + func_arith $current - $age + major=.$func_arith_result + versuffix=$major.$age.$revision ;; irix | nonstopux) - if test "X$lt_irix_increment" = "Xno"; then + if test no = "$lt_irix_increment"; then func_arith $current - $age else func_arith $current - $age + 1 @@ -7430,69 +8914,74 @@ nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; esac - verstring="$verstring_prefix$major.$revision" + verstring=$verstring_prefix$major.$revision # Add in all the interfaces that we are compatible with. loop=$revision - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $revision - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring_prefix$major.$iface:$verstring" + verstring=$verstring_prefix$major.$iface:$verstring done - # Before this point, $major must not contain `.'. + # Before this point, $major must not contain '.'. major=.$major - versuffix="$major.$revision" + versuffix=$major.$revision ;; linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result - versuffix="$major.$age.$revision" + versuffix=$major.$age.$revision ;; osf) func_arith $current - $age major=.$func_arith_result - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" + versuffix=.$current.$age.$revision + verstring=$current.$age.$revision # Add in all the interfaces that we are compatible with. loop=$age - while test "$loop" -ne 0; do + while test 0 -ne "$loop"; do func_arith $current - $loop iface=$func_arith_result func_arith $loop - 1 loop=$func_arith_result - verstring="$verstring:${iface}.0" + verstring=$verstring:$iface.0 done # Make executables depend on our current version. - func_append verstring ":${current}.0" + func_append verstring ":$current.0" ;; qnx) - major=".$current" - versuffix=".$current" + major=.$current + versuffix=.$current + ;; + + sco) + major=.$current + versuffix=.$current ;; sunos) - major=".$current" - versuffix=".$current.$revision" + major=.$current + versuffix=.$current.$revision ;; windows) # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. + # extension on DOS 8.3 file systems. func_arith $current - $age major=$func_arith_result - versuffix="-$major" + versuffix=-$major ;; *) - func_fatal_configuration "unknown library version type \`$version_type'" + func_fatal_configuration "unknown library version type '$version_type'" ;; esac @@ -7506,42 +8995,45 @@ verstring= ;; *) - verstring="0.0" + verstring=0.0 ;; esac - if test "$need_version" = no; then + if test no = "$need_version"; then versuffix= else - versuffix=".0.0" + versuffix=.0.0 fi fi # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then + if test yes,no = "$avoid_version,$need_version"; then major= versuffix= - verstring="" + verstring= fi # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - func_warning "undefined symbols not allowed in $host shared libraries" - build_libtool_libs=no - build_old_libs=yes + if test yes = "$allow_undefined"; then + if test unsupported = "$allow_undefined_flag"; then + if test yes = "$build_old_libs"; then + func_warning "undefined symbols not allowed in $host shared libraries; building static only" + build_libtool_libs=no + else + func_fatal_error "can't build $host shared library unless -no-undefined is specified" + fi fi else # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" + allow_undefined_flag=$no_undefined_flag fi fi - func_generate_dlsyms "$libname" "$libname" "yes" + func_generate_dlsyms "$libname" "$libname" : func_append libobjs " $symfileobj" - test "X$libobjs" = "X " && libobjs= + test " " = "$libobjs" && libobjs= - if test "$opt_mode" != relink; then + if test relink != "$opt_mode"; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -7550,8 +9042,8 @@ case $p in *.$objext | *.gcno) ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then + $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*) + if test -n "$precious_files_regex"; then if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 then continue @@ -7567,11 +9059,11 @@ fi # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then + if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. @@ -7592,13 +9084,13 @@ *) func_append finalize_rpath " $libdir" ;; esac done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then + if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then dependency_libs="$temp_xrpath $dependency_libs" fi fi # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" + old_dlfiles=$dlfiles dlfiles= for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in @@ -7608,7 +9100,7 @@ done # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" + old_dlprefiles=$dlprefiles dlprefiles= for lib in $old_dlprefiles; do case "$dlprefiles " in @@ -7617,7 +9109,7 @@ esac done - if test "$build_libtool_libs" = yes; then + if test yes = "$build_libtool_libs"; then if test -n "$rpath"; then case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) @@ -7641,7 +9133,7 @@ ;; *) # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then + if test yes = "$build_libtool_need_lc"; then func_append deplibs " -lc" fi ;; @@ -7657,9 +9149,9 @@ # I'm not sure if I'm treating the release correctly. I think # release should show up in the -l (ie -lgmp5) so we don't want to # add it in twice. Is that correct? - release="" - versuffix="" - major="" + release= + versuffix= + major= newdeplibs= droppeddeps=no case $deplibs_check_method in @@ -7688,20 +9180,20 @@ -l*) func_stripname -l '' "$i" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7731,20 +9223,20 @@ $opt_dry_run || $RM conftest if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $i "*) func_append newdeplibs " $i" - i="" + i= ;; esac fi - if test -n "$i" ; then + if test -n "$i"; then libname=`eval "\\$ECHO \"$libname_spec\""` deplib_matches=`eval "\\$ECHO \"$library_names_spec\""` set dummy $deplib_matches; shift deplib_match=$1 - if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then + if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then func_append newdeplibs " $i" else droppeddeps=yes @@ -7781,24 +9273,24 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` if test -n "$file_magic_glob"; then libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` else libnameglob=$libname fi - test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` + test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - if test "$want_nocaseglob" = yes; then + if test yes = "$want_nocaseglob"; then shopt -s nocaseglob potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` $nocaseglob @@ -7816,25 +9308,25 @@ # We might still enter an endless loop, since a link # loop can be closed while we follow links, # but so what? - potlib="$potent_lib" + potlib=$potent_lib while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` + potliblink=`ls -ld $potlib | $SED 's/.* -> //'` case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; + [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;; + *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7842,7 +9334,7 @@ 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 + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7865,30 +9357,30 @@ -l*) func_stripname -l '' "$a_deplib" name=$func_stripname_result - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then + if test yes = "$allow_libtool_libs_with_static_runtimes"; then case " $predeps $postdeps " in *" $a_deplib "*) func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= ;; esac fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then libname=`eval "\\$ECHO \"$libname_spec\""` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test + potlib=$potent_lib # see symlink-check above in file_magic test if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then func_append newdeplibs " $a_deplib" - a_deplib="" + a_deplib= break 2 fi done done fi - if test -n "$a_deplib" ; then + if test -n "$a_deplib"; then droppeddeps=yes echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." @@ -7896,7 +9388,7 @@ 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 + if test -z "$potlib"; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else $ECHO "*** with $libname and none of the candidates passed a file format test" @@ -7912,18 +9404,18 @@ done # Gone through all deplibs. ;; none | unknown | *) - newdeplibs="" + newdeplibs= tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do + if test yes = "$allow_libtool_libs_with_static_runtimes"; 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 " $tmp_deplibs" | $SED "s|$i||"` done fi case $tmp_deplibs in *[!\ \ ]*) echo - if test "X$deplibs_check_method" = "Xnone"; then + if test none = "$deplibs_check_method"; then echo "*** Warning: inter-library dependencies are not supported in this platform." else echo "*** Warning: inter-library dependencies are not known to be supported." @@ -7947,8 +9439,8 @@ ;; esac - if test "$droppeddeps" = yes; then - if test "$module" = yes; then + if test yes = "$droppeddeps"; then + if test yes = "$module"; then echo echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" @@ -7957,12 +9449,12 @@ 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 "*** 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 "*** 'nm' from GNU binutils and a full rebuild may help." fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -7973,14 +9465,14 @@ echo "*** automatically added whenever a program is linked with this library" echo "*** or is declared to -dlopen it." - if test "$allow_undefined" = no; then + if test no = "$allow_undefined"; 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." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" + if test no = "$build_old_libs"; then + oldlibs=$output_objdir/$libname.$libext build_libtool_libs=module build_old_libs=yes else @@ -8026,7 +9518,7 @@ *) func_append new_libs " $deplib" ;; esac done - deplibs="$new_libs" + deplibs=$new_libs # All the library-specific variables (install_libdir is set above). library_names= @@ -8034,25 +9526,25 @@ dlname= # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - # Remove ${wl} instances when linking with ld. + if test yes = "$build_libtool_libs"; then + # Remove $wl instances when linking with ld. # FIXME: should test the right _cmds variable. case $archive_cmds in *\$LD\ *) wl= ;; esac - if test "$hardcode_into_libs" = yes; then + if test yes = "$hardcode_into_libs"; then # Hardcode the library paths hardcode_libdirs= dep_rpath= - rpath="$finalize_rpath" - test "$opt_mode" != relink && rpath="$compile_rpath$rpath" + rpath=$finalize_rpath + test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then func_replace_sysroot "$libdir" libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8077,7 +9569,7 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then @@ -8091,8 +9583,8 @@ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" fi - shlibpath="$finalize_shlibpath" - test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + shlibpath=$finalize_shlibpath + test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -8102,19 +9594,19 @@ eval library_names=\"$library_names_spec\" set dummy $library_names shift - realname="$1" + realname=$1 shift if test -n "$soname_spec"; then eval soname=\"$soname_spec\" else - soname="$realname" + soname=$realname fi if test -z "$dlname"; then dlname=$soname fi - lib="$output_objdir/$realname" + lib=$output_objdir/$realname linknames= for link do @@ -8128,7 +9620,7 @@ delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" - export_symbols="$output_objdir/$libname.uexp" + export_symbols=$output_objdir/$libname.uexp func_append delfiles " $export_symbols" fi @@ -8137,31 +9629,31 @@ cygwin* | mingw* | cegcc*) if test -n "$export_symbols" && test -z "$export_symbols_regex"; then # exporting using user supplied symfile - if test "x`$SED 1q $export_symbols`" != xEXPORTS; then + func_dll_def_p "$export_symbols" || { # and it's NOT already a .def file. Must figure out # which of the given symbols are data symbols and tag # them as such. So, trigger use of export_symbols_cmds. # export_symbols gets reassigned inside the "prepare # the list of exported symbols" if statement, so the # include_expsyms logic still works. - orig_export_symbols="$export_symbols" + orig_export_symbols=$export_symbols export_symbols= always_export_symbols=yes - fi + } fi ;; esac # Prepare the list of exported symbols if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd1 in $cmds; do - IFS="$save_ifs" + IFS=$save_ifs # Take the normal branch if the nm_file_list_spec branch # doesn't work or if tool conversion is not needed. case $nm_file_list_spec~$to_tool_file_cmd in @@ -8175,7 +9667,7 @@ try_normal_branch=no ;; esac - if test "$try_normal_branch" = yes \ + if test yes = "$try_normal_branch" \ && { test "$len" -lt "$max_cmd_len" \ || test "$max_cmd_len" -le -1; } then @@ -8186,7 +9678,7 @@ output_la=$func_basename_result save_libobjs=$libobjs save_output=$output - output=${output_objdir}/${output_la}.nm + output=$output_objdir/$output_la.nm func_to_tool_file "$output" libobjs=$nm_file_list_spec$func_to_tool_file_result func_append delfiles " $output" @@ -8209,8 +9701,8 @@ break fi done - IFS="$save_ifs" - if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then + IFS=$save_ifs + if test -n "$export_symbols_regex" && test : != "$skipped_export"; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' func_show_eval '$MV "${export_symbols}T" "$export_symbols"' fi @@ -8218,16 +9710,16 @@ fi 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" + 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"' fi - if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then + if test : != "$skipped_export" && test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8246,11 +9738,11 @@ ;; esac done - deplibs="$tmp_deplibs" + deplibs=$tmp_deplibs if test -n "$convenience"; then if test -n "$whole_archive_flag_spec" && - test "$compiler_needs_object" = yes && + test yes = "$compiler_needs_object" && test -z "$libobjs"; then # extract the archives, so we have objects to list. # TODO: could optimize this to just extract one archive. @@ -8261,7 +9753,7 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" test "X$libobjs" = "X " && libobjs= else - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8270,18 +9762,18 @@ fi fi - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then + if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then eval test_cmds=\"$module_expsym_cmds\" cmds=$module_expsym_cmds @@ -8299,7 +9791,7 @@ fi fi - if test "X$skipped_export" != "X:" && + if test : != "$skipped_export" && func_len " $test_cmds" && len=$func_len_result && test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then @@ -8332,8 +9824,8 @@ last_robj= k=1 - if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then - output=${output_objdir}/${output_la}.lnkscript + if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then + output=$output_objdir/$output_la.lnkscript func_verbose "creating GNU ld script: $output" echo 'INPUT (' > $output for obj in $save_libobjs @@ -8345,14 +9837,14 @@ func_append delfiles " $output" func_to_tool_file "$output" output=$func_to_tool_file_result - elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then - output=${output_objdir}/${output_la}.lnk + elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then + output=$output_objdir/$output_la.lnk func_verbose "creating linker input file list: $output" : > $output set x $save_libobjs shift firstobj= - if test "$compiler_needs_object" = yes; then + if test yes = "$compiler_needs_object"; then firstobj="$1 " shift fi @@ -8367,7 +9859,7 @@ else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext eval test_cmds=\"$reload_cmds\" func_len " $test_cmds" len0=$func_len_result @@ -8379,13 +9871,13 @@ func_len " $obj" func_arith $len + $func_len_result len=$func_arith_result - if test "X$objlist" = X || + if test -z "$objlist" || test "$len" -lt "$max_cmd_len"; then func_append objlist " $obj" else # The command $test_cmds is almost too long, add a # command to the queue. - if test "$k" -eq 1 ; then + if test 1 -eq "$k"; then # The first file doesn't have a previous command to add. reload_objs=$objlist eval concat_cmds=\"$reload_cmds\" @@ -8395,10 +9887,10 @@ reload_objs="$objlist $last_robj" eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi - last_robj=$output_objdir/$output_la-${k}.$objext + last_robj=$output_objdir/$output_la-$k.$objext func_arith $k + 1 k=$func_arith_result - output=$output_objdir/$output_la-${k}.$objext + output=$output_objdir/$output_la-$k.$objext objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result @@ -8410,9 +9902,9 @@ # 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\" if test -n "$last_robj"; then - eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" + eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi func_append delfiles " $output" @@ -8420,9 +9912,9 @@ output= fi - if ${skipped_export-false}; then - func_verbose "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" + ${skipped_export-false} && { + func_verbose "generating symbol list for '$libname.la'" + export_symbols=$output_objdir/$libname.exp $opt_dry_run || $RM $export_symbols libobjs=$output # Append the command to create the export file. @@ -8431,16 +9923,16 @@ if test -n "$last_robj"; then eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\" fi - fi + } test -n "$save_libobjs" && func_verbose "creating a temporary reloadable object file: $output" # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $concat_cmds; do - IFS="$save_ifs" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8448,7 +9940,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8457,7 +9949,7 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs if test -n "$export_symbols_regex" && ${skipped_export-false}; then func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' @@ -8465,18 +9957,18 @@ fi fi - if ${skipped_export-false}; then + ${skipped_export-false} && { 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" + 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"' fi if test -n "$orig_export_symbols"; then # The given exports_symbols file has to be filtered, so filter it. - func_verbose "filter symbol list for \`$libname.la' to tag DATA exports" + func_verbose "filter symbol list for '$libname.la' to tag DATA exports" # FIXME: $output_objdir/$libname.filter potentially contains lots of - # 's' commands which not all seds can handle. GNU sed should be fine + # 's' commands, which not all seds can handle. GNU sed should be fine # though. Also, the filter scales superlinearly with the number of # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. @@ -8485,7 +9977,7 @@ export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi - fi + } libobjs=$output # Restore the value of output. @@ -8499,7 +9991,7 @@ # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then + if test yes = "$module" && test -n "$module_cmds"; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then cmds=$module_expsym_cmds else @@ -8521,7 +10013,7 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -8529,11 +10021,12 @@ test "X$libobjs" = "X " && libobjs= fi - save_ifs="$IFS"; IFS='~' + save_ifs=$IFS; IFS='~' for cmd in $cmds; do - IFS="$save_ifs" + IFS=$sp$nl eval cmd=\"$cmd\" - $opt_silent || { + IFS=$save_ifs + $opt_quiet || { func_quote_for_expand "$cmd" eval "func_echo $func_quote_for_expand_result" } @@ -8541,7 +10034,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -8550,10 +10043,10 @@ exit $lt_exit } done - IFS="$save_ifs" + IFS=$save_ifs # Restore the uninstalled library and exit - if test "$opt_mode" = relink; then + if test relink = "$opt_mode"; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -8573,39 +10066,39 @@ done # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then + if test yes = "$module" || test yes = "$export_dynamic"; then # On all known operating systems, these are identical. - dlname="$soname" + dlname=$soname fi fi ;; obj) - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - func_warning "\`-dlopen' is ignored for objects" + if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then + func_warning "'-dlopen' is ignored for objects" fi case " $deplibs" in *\ -l* | *\ -L*) - func_warning "\`-l' and \`-L' are ignored for objects" ;; + func_warning "'-l' and '-L' are ignored for objects" ;; esac test -n "$rpath" && \ - func_warning "\`-rpath' is ignored for objects" + func_warning "'-rpath' is ignored for objects" test -n "$xrpath" && \ - func_warning "\`-R' is ignored for objects" + func_warning "'-R' is ignored for objects" test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for objects" + func_warning "'-version-info' is ignored for objects" test -n "$release" && \ - func_warning "\`-release' is ignored for objects" + func_warning "'-release' is ignored for objects" case $output in *.lo) test -n "$objs$old_deplibs" && \ - func_fatal_error "cannot build library object \`$output' from non-libtool objects" + func_fatal_error "cannot build library object '$output' from non-libtool objects" libobj=$output func_lo2o "$libobj" @@ -8613,7 +10106,7 @@ ;; *) libobj= - obj="$output" + obj=$output ;; esac @@ -8626,17 +10119,19 @@ # the extraction. reload_conv_objs= gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec and hope we can get by with - # turning comma into space.. - wl= - + # if reload_cmds runs $LD directly, get rid of -Wl from + # whole_archive_flag_spec and hope we can get by with turning comma + # into space. + case $reload_cmds in + *\$LD[\ \$]*) wl= ;; + esac 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'` + test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` + reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags else - gentop="$output_objdir/${obj}x" + gentop=$output_objdir/${obj}x func_append generated " $gentop" func_extract_archives $gentop $convenience @@ -8645,12 +10140,12 @@ fi # If we're not building shared, we need to use non_pic_objs - test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + test yes = "$build_libtool_libs" || libobjs=$non_pic_objects # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs - output="$obj" + output=$obj func_execute_cmds "$reload_cmds" 'exit $?' # Exit if we aren't doing a library object file. @@ -8662,7 +10157,7 @@ exit $EXIT_SUCCESS fi - if test "$build_libtool_libs" != yes; then + test yes = "$build_libtool_libs" || { if test -n "$gentop"; then func_show_eval '${RM}r "$gentop"' fi @@ -8672,12 +10167,12 @@ # $show "echo timestamp > $libobj" # $opt_dry_run || eval "echo timestamp > $libobj" || exit $? exit $EXIT_SUCCESS - fi + } - if test -n "$pic_flag" || test "$pic_mode" != default; then + if test -n "$pic_flag" || test default != "$pic_mode"; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" - output="$libobj" + output=$libobj func_execute_cmds "$reload_cmds" 'exit $?' fi @@ -8694,16 +10189,14 @@ output=$func_stripname_result.exe;; esac test -n "$vinfo" && \ - func_warning "\`-version-info' is ignored for programs" + func_warning "'-version-info' is ignored for programs" test -n "$release" && \ - func_warning "\`-release' is ignored for programs" + func_warning "'-release' is ignored for programs" - test "$preload" = yes \ - && test "$dlopen_support" = unknown \ - && test "$dlopen_self" = unknown \ - && test "$dlopen_self_static" = unknown && \ - func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support." + $preload \ + && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \ + && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support." case $host in *-*-rhapsody* | *-*-darwin1.[012]) @@ -8717,11 +10210,11 @@ *-*-darwin*) # Don't allow lazy linking, it breaks C++ global constructors # But is supposedly fixed on 10.4 or later (yay!). - if test "$tagname" = CXX ; then + if test CXX = "$tagname"; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - func_append compile_command " ${wl}-bind_at_load" - func_append finalize_command " ${wl}-bind_at_load" + func_append compile_command " $wl-bind_at_load" + func_append finalize_command " $wl-bind_at_load" ;; esac fi @@ -8757,7 +10250,7 @@ *) func_append new_libs " $deplib" ;; esac done - compile_deplibs="$new_libs" + compile_deplibs=$new_libs func_append compile_command " $compile_deplibs" @@ -8781,7 +10274,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8804,7 +10297,7 @@ fi case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'` case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; @@ -8821,10 +10314,10 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - compile_rpath="$rpath" + compile_rpath=$rpath rpath= hardcode_libdirs= @@ -8832,7 +10325,7 @@ if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" + hardcode_libdirs=$libdir else # Just accumulate the unique libdirs. case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in @@ -8857,45 +10350,43 @@ # Substitute the hardcoded libdirs into the rpath. if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" + libdir=$hardcode_libdirs eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + finalize_rpath=$rpath - if test -n "$libobjs" && test "$build_old_libs" = yes; then + if test -n "$libobjs" && test yes = "$build_old_libs"; 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` fi - func_generate_dlsyms "$outputname" "@PROGRAM@" "no" + func_generate_dlsyms "$outputname" "@PROGRAM@" false # template prelinking step if test -n "$prelink_cmds"; then func_execute_cmds "$prelink_cmds" 'exit $?' fi - wrappers_required=yes + wrappers_required=: case $host in *cegcc* | *mingw32ce*) # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. - wrappers_required=no + wrappers_required=false ;; *cygwin* | *mingw* ) - if test "$build_libtool_libs" != yes; then - wrappers_required=no - fi + test yes = "$build_libtool_libs" || wrappers_required=false ;; *) - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - wrappers_required=no + if test no = "$need_relink" || test yes != "$build_libtool_libs"; then + wrappers_required=false fi ;; esac - if test "$wrappers_required" = no; then + $wrappers_required || { # Replace the output file specification. compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" + link_command=$compile_command$compile_rpath # We have no uninstalled library dependencies, so finalize right now. exit_status=0 @@ -8908,12 +10399,12 @@ fi # Delete the generated files. - if test -f "$output_objdir/${outputname}S.${objext}"; then - func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' + if test -f "$output_objdir/${outputname}S.$objext"; then + func_show_eval '$RM "$output_objdir/${outputname}S.$objext"' fi exit $exit_status - fi + } if test -n "$compile_shlibpath$finalize_shlibpath"; then compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" @@ -8943,9 +10434,9 @@ fi fi - if test "$no_install" = yes; then + if test yes = "$no_install"; then # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" + link_command=$compile_var$compile_command$compile_rpath # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. @@ -8962,27 +10453,28 @@ exit $EXIT_SUCCESS fi - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - func_warning "this platform does not like uninstalled shared libraries" - func_warning "\`$output' will be relinked during installation" - else - 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'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi + case $hardcode_action,$fast_install in + relink,*) + # Fast installation is not supported + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + + func_warning "this platform does not like uninstalled shared libraries" + func_warning "'$output' will be relinked during installation" + ;; + *,yes) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` + ;; + *,no) + link_command=$compile_var$compile_command$compile_rpath + relink_command=$finalize_var$finalize_command$finalize_rpath + ;; + *,needless) + link_command=$finalize_var$compile_command$finalize_rpath + relink_command= + ;; + esac # Replace the output file specification. link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` @@ -9039,8 +10531,8 @@ func_dirname_and_basename "$output" "" "." output_name=$func_basename_result output_path=$func_dirname_result - cwrappersource="$output_path/$objdir/lt-$output_name.c" - cwrapper="$output_path/$output_name.exe" + cwrappersource=$output_path/$objdir/lt-$output_name.c + cwrapper=$output_path/$output_name.exe $RM $cwrappersource $cwrapper trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -9061,7 +10553,7 @@ trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15 $opt_dry_run || { # note: this script will not be executed, so do not chmod. - if test "x$build" = "x$host" ; then + if test "x$build" = "x$host"; then $cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result else func_emit_wrapper no > $func_ltwrapper_scriptname_result @@ -9084,25 +10576,27 @@ # See if we need to build an old-fashioned archive. for oldlib in $oldlibs; do - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save $symfileobj" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" + case $build_libtool_libs in + convenience) + oldobjs="$libobjs_save $symfileobj" + addlibs=$convenience build_libtool_libs=no - else + ;; + module) + oldobjs=$libobjs_save + addlibs=$old_convenience + build_libtool_libs=no + ;; + *) oldobjs="$old_deplibs $non_pic_objects" - if test "$preload" = yes && test -f "$symfileobj"; then - func_append oldobjs " $symfileobj" - fi - fi - addlibs="$old_convenience" - fi + $preload && test -f "$symfileobj" \ + && func_append oldobjs " $symfileobj" + addlibs=$old_convenience + ;; + esac if test -n "$addlibs"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $addlibs @@ -9110,13 +10604,13 @@ fi # Do each command in the archive commands. - if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then + if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then cmds=$old_archive_from_new_cmds else # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_extract_archives $gentop $dlprefiles @@ -9137,7 +10631,7 @@ : else echo "copying selected object files to avoid basename conflicts..." - gentop="$output_objdir/${outputname}x" + gentop=$output_objdir/${outputname}x func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs @@ -9146,7 +10640,7 @@ for obj in $save_oldobjs do func_basename "$obj" - objbase="$func_basename_result" + objbase=$func_basename_result case " $oldobjs " in " ") oldobjs=$obj ;; *[\ /]"$objbase "*) @@ -9215,18 +10709,18 @@ else # the above command should be used before it gets too long oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then + if test "$obj" = "$last_oldobj"; then RANLIB=$save_RANLIB fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" + eval concat_cmds=\"\$concat_cmds$old_archive_cmds\" objlist= len=$len0 fi done RANLIB=$save_RANLIB oldobjs=$objlist - if test "X$oldobjs" = "X" ; then + if test -z "$oldobjs"; then eval cmds=\"\$concat_cmds\" else eval cmds=\"\$concat_cmds~\$old_archive_cmds\" @@ -9243,7 +10737,7 @@ case $output in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" + test yes = "$build_old_libs" && old_library=$libname.$libext func_verbose "creating $output" # Preserve any variables that may affect compiler behavior @@ -9258,31 +10752,31 @@ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then + if test yes = "$hardcode_automatic"; then relink_command= fi # Only create the output if not a dry run. $opt_dry_run || { for installed in no yes; do - if test "$installed" = yes; then + if test yes = "$installed"; then if test -z "$install_libdir"; then break fi - output="$output_objdir/$outputname"i + output=$output_objdir/${outputname}i # Replace all uninstalled libtool libraries with the installed ones newdependency_libs= for deplib in $dependency_libs; do case $deplib in *.la) func_basename "$deplib" - name="$func_basename_result" + name=$func_basename_result func_resolve_sysroot "$deplib" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ - func_fatal_error "\`$deplib' is not a valid libtool archive" + func_fatal_error "'$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" ;; -L*) @@ -9298,23 +10792,23 @@ *) func_append newdependency_libs " $deplib" ;; esac done - dependency_libs="$newdependency_libs" + dependency_libs=$newdependency_libs newdlfiles= for lib in $dlfiles; do case $lib in *.la) func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; *) func_append newdlfiles " $lib" ;; esac done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in @@ -9324,34 +10818,34 @@ # didn't already link the preopened objects directly into # the library: func_basename "$lib" - name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` + name=$func_basename_result + eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ - func_fatal_error "\`$lib' is not a valid libtool archive" + func_fatal_error "'$lib' is not a valid libtool archive" func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles else newdlfiles= for lib in $dlfiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlfiles " $abs" done - dlfiles="$newdlfiles" + dlfiles=$newdlfiles newdlprefiles= for lib in $dlprefiles; do case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;; *) abs=`pwd`"/$lib" ;; esac func_append newdlprefiles " $abs" done - dlprefiles="$newdlprefiles" + dlprefiles=$newdlprefiles fi $RM $output # place dlname in correct position for cygwin @@ -9367,10 +10861,9 @@ 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 + if test -n "$bindir"; then func_relative_path "$install_libdir" "$bindir" - tdlname=$func_relative_path_result$dlname + tdlname=$func_relative_path_result/$dlname else # Otherwise fall back on heuristic. tdlname=../bin/$dlname @@ -9379,7 +10872,7 @@ esac $ECHO > $output "\ # $outputname - a libtool library file -# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION +# Generated by $PROGRAM (GNU $PACKAGE) $VERSION # # Please DO NOT delete this file! # It is necessary for linking the library. @@ -9393,7 +10886,7 @@ # The name of the static archive. old_library='$old_library' -# Linker flags that can not go in dependency_libs. +# Linker flags that cannot go in dependency_libs. inherited_linker_flags='$new_inherited_linker_flags' # Libraries that this one depends upon. @@ -9419,7 +10912,7 @@ # Directory that this library needs to be installed in: libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then + if test no,yes = "$installed,$need_relink"; then $ECHO >> $output "\ relink_command=\"$relink_command\"" fi @@ -9434,27 +10927,29 @@ exit $EXIT_SUCCESS } -{ test "$opt_mode" = link || test "$opt_mode" = relink; } && - func_mode_link ${1+"$@"} +if test link = "$opt_mode" || test relink = "$opt_mode"; then + func_mode_link ${1+"$@"} +fi # func_mode_uninstall arg... func_mode_uninstall () { - $opt_debug - RM="$nonopt" + $debug_cmd + + RM=$nonopt files= - rmforce= + rmforce=false exit_status=0 # This variable tells wrapper scripts just to set variables rather # than running their programs. - libtool_install_magic="$magic" + libtool_install_magic=$magic for arg do case $arg in - -f) func_append RM " $arg"; rmforce=yes ;; + -f) func_append RM " $arg"; rmforce=: ;; -*) func_append RM " $arg" ;; *) func_append files " $arg" ;; esac @@ -9467,18 +10962,18 @@ for file in $files; do func_dirname "$file" "" "." - dir="$func_dirname_result" - if test "X$dir" = X.; then - odir="$objdir" + dir=$func_dirname_result + if test . = "$dir"; then + odir=$objdir else - odir="$dir/$objdir" + odir=$dir/$objdir fi func_basename "$file" - name="$func_basename_result" - test "$opt_mode" = uninstall && odir="$dir" + name=$func_basename_result + test uninstall = "$opt_mode" && odir=$dir # Remember odir for removal later, being careful to avoid duplicates - if test "$opt_mode" = clean; then + if test clean = "$opt_mode"; then case " $rmdirs " in *" $odir "*) ;; *) func_append rmdirs " $odir" ;; @@ -9493,11 +10988,11 @@ elif test -d "$file"; then exit_status=1 continue - elif test "$rmforce" = yes; then + elif $rmforce; then continue fi - rmfiles="$file" + rmfiles=$file case $name in *.la) @@ -9511,7 +11006,7 @@ done test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$opt_mode" in + case $opt_mode in clean) case " $library_names " in *" $dlname "*) ;; @@ -9522,12 +11017,12 @@ uninstall) if test -n "$library_names"; then # Do each command in the postuninstall commands. - func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1' fi if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1' + func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1' fi # FIXME: should reinstall the best remaining shared library. ;; @@ -9543,21 +11038,19 @@ func_source $dir/$name # Add PIC object to the list of files to remove. - if test -n "$pic_object" && - test "$pic_object" != none; then + if test -n "$pic_object" && test none != "$pic_object"; then func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" && - test "$non_pic_object" != none; then + if test -n "$non_pic_object" && test none != "$non_pic_object"; then func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$opt_mode" = clean ; then + if test clean = "$opt_mode"; then noexename=$name case $file in *.exe) @@ -9584,12 +11077,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - func_append rmfiles " $odir/$name $odir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then + func_append rmfiles " $odir/$name $odir/${name}S.$objext" + if test yes = "$fast_install" && test -n "$relink_command"; then func_append rmfiles " $odir/lt-$name" fi - if test "X$noexename" != "X$name" ; then - func_append rmfiles " $odir/lt-${noexename}.c" + if test "X$noexename" != "X$name"; then + func_append rmfiles " $odir/lt-$noexename.c" fi fi fi @@ -9598,7 +11091,7 @@ func_show_eval "$RM $rmfiles" 'exit_status=1' done - # Try to remove the ${objdir}s in the directories where we deleted files + # Try to remove the $objdir's in the directories where we deleted files for dir in $rmdirs; do if test -d "$dir"; then func_show_eval "rmdir $dir >/dev/null 2>&1" @@ -9608,16 +11101,17 @@ exit $exit_status } -{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && - func_mode_uninstall ${1+"$@"} +if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then + func_mode_uninstall ${1+"$@"} +fi test -z "$opt_mode" && { - help="$generic_help" + help=$generic_help func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$opt_mode'" + func_fatal_help "invalid operation mode '$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" @@ -9628,7 +11122,7 @@ # The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting +# where we disable both kinds of libraries. Given conflicting # choices, we go for a static library, that is the most portable, # since we can't tell whether shared libraries were disabled because # the user asked for that or because the platform doesn't support @@ -9651,5 +11145,3 @@ # mode:shell-script # sh-indentation:2 # End: -# vi:sw=2 - diff -Nru libsoup2.4-2.52.2/build-aux/missing libsoup2.4-2.54.1/build-aux/missing --- libsoup2.4-2.52.2/build-aux/missing 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/missing 2016-04-26 12:36:12.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru libsoup2.4-2.52.2/build-aux/test-driver libsoup2.4-2.54.1/build-aux/test-driver --- libsoup2.4-2.52.2/build-aux/test-driver 2015-11-09 20:25:05.000000000 +0000 +++ libsoup2.4-2.54.1/build-aux/test-driver 2016-04-26 12:36:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -106,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -119,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru libsoup2.4-2.52.2/config.h.in libsoup2.4-2.54.1/config.h.in --- libsoup2.4-2.52.2/config.h.in 2015-11-09 20:25:07.000000000 +0000 +++ libsoup2.4-2.54.1/config.h.in 2016-04-26 12:36:12.000000000 +0000 @@ -57,8 +57,10 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Whether or not GSSAPI libs are available */ +#undef LIBSOUP_HAVE_GSSAPI + +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Samba's 'winbind' daemon helper 'ntlm_auth' which can be used for NTLM @@ -95,3 +97,6 @@ /* Version number of package */ #undef VERSION + +/* defines how to decorate public symbols while building */ +#undef _SOUP_EXTERN diff -Nru libsoup2.4-2.52.2/config.h.win32 libsoup2.4-2.54.1/config.h.win32 --- libsoup2.4-2.52.2/config.h.win32 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/config.h.win32 2016-04-26 12:36:14.000000000 +0000 @@ -0,0 +1,116 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Apache httpd */ +/* #undef APACHE_HTTPD */ + +/* The gettext domain name */ +#define GETTEXT_PACKAGE "libsoup" + +/* Whether or not apache can be used for tests */ +/* #undef HAVE_APACHE */ + +/* Apache is 2.2.x */ +/* #undef HAVE_APACHE_2_2 */ + +/* Apache is 2.4.x */ +/* #undef HAVE_APACHE_2_4 */ + +/* Whether or not curl can be used for tests */ +#define HAVE_CURL 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the `gmtime_r' function. */ +/* #undef HAVE_GMTIME_R */ + +/* Defined if GNOME support is enabled */ +#define HAVE_GNOME 1 + +/* Define to 1 if you have the header file. */ +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) +#define HAVE_INTTYPES_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Have php-xmlrpc */ +/* #undef HAVE_PHP_XMLRPC */ + +/* Define to 1 if you have the header file. */ +#if !defined (_MSC_VER) || (_MSC_VER >= 1600) +#define HAVE_STDINT_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_STRINGS_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#defin HAVE_UNISTD_H 1 +#endif + +/* Whether or not GSSAPI libs are available */ +/* Note: This is activated in the projects when the appropriate config is selected */ +/* #undef LIBSOUP_HAVE_GSSAPI */ + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Samba's 'winbind' daemon helper 'ntlm_auth' which can be used for NTLM + single-sign-on */ +/* #undef NTLM_AUTH */ + +/* Name of package */ +#define PACKAGE "libsoup" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "libsoup" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "libsoup 2.54.1" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "libsoup" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.54.1" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Whether or not use Samba's 'winbind' daemon helper 'ntlm_auth' for NTLM + single-sign-on */ +/* #undef USE_NTLM_AUTH */ + +/* Version number of package */ +#define VERSION "@PACKAGE_VERSION" + +/* defines how to decorate public symbols while building */ +#ifdef _MSC_VER +#define _SOUP_EXTERN __declspec (dllexport) extern +#else +#define _SOUP_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern +#endif diff -Nru libsoup2.4-2.52.2/config.h.win32.in libsoup2.4-2.54.1/config.h.win32.in --- libsoup2.4-2.52.2/config.h.win32.in 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/config.h.win32.in 2016-04-25 15:17:18.000000000 +0000 @@ -0,0 +1,116 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Apache httpd */ +/* #undef APACHE_HTTPD */ + +/* The gettext domain name */ +#define GETTEXT_PACKAGE "libsoup" + +/* Whether or not apache can be used for tests */ +/* #undef HAVE_APACHE */ + +/* Apache is 2.2.x */ +/* #undef HAVE_APACHE_2_2 */ + +/* Apache is 2.4.x */ +/* #undef HAVE_APACHE_2_4 */ + +/* Whether or not curl can be used for tests */ +#define HAVE_CURL 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the `gmtime_r' function. */ +/* #undef HAVE_GMTIME_R */ + +/* Defined if GNOME support is enabled */ +#define HAVE_GNOME 1 + +/* Define to 1 if you have the header file. */ +#if !defined (_MSC_VER) || (_MSC_VER >= 1800) +#define HAVE_INTTYPES_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Have php-xmlrpc */ +/* #undef HAVE_PHP_XMLRPC */ + +/* Define to 1 if you have the header file. */ +#if !defined (_MSC_VER) || (_MSC_VER >= 1600) +#define HAVE_STDINT_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_STRINGS_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#defin HAVE_UNISTD_H 1 +#endif + +/* Whether or not GSSAPI libs are available */ +/* Note: This is activated in the projects when the appropriate config is selected */ +/* #undef LIBSOUP_HAVE_GSSAPI */ + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Samba's 'winbind' daemon helper 'ntlm_auth' which can be used for NTLM + single-sign-on */ +/* #undef NTLM_AUTH */ + +/* Name of package */ +#define PACKAGE "@PACKAGE@" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "@PACKAGE_NAME@" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "@PACKAGE_NAME@ @PACKAGE_VERSION@" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "@PACKAGE_TARNAME@" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@PACKAGE_VERSION@" + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Whether or not use Samba's 'winbind' daemon helper 'ntlm_auth' for NTLM + single-sign-on */ +/* #undef USE_NTLM_AUTH */ + +/* Version number of package */ +#define VERSION "@PACKAGE_VERSION" + +/* defines how to decorate public symbols while building */ +#ifdef _MSC_VER +#define _SOUP_EXTERN __declspec (dllexport) extern +#else +#define _SOUP_EXTERN __attribute__((visibility("default"))) __declspec (dllexport) extern +#endif diff -Nru libsoup2.4-2.52.2/configure libsoup2.4-2.54.1/configure --- libsoup2.4-2.52.2/configure 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/configure 2016-04-26 12:36:11.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libsoup 2.52.2. +# Generated by GNU Autoconf 2.69 for libsoup 2.54.1. # # Report bugs to . # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='libsoup' PACKAGE_TARNAME='libsoup' -PACKAGE_VERSION='2.52.2' -PACKAGE_STRING='libsoup 2.52.2' +PACKAGE_VERSION='2.54.1' +PACKAGE_STRING='libsoup 2.54.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup' PACKAGE_URL='' @@ -697,6 +697,10 @@ am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +SOUP_HIDDEN_VISIBILITY_CFLAGS +KRB5_LIBS +KRB5_CFLAGS +KRB5_CONFIG CODE_COVERAGE_RULES CODE_COVERAGE_LDFLAGS CODE_COVERAGE_CFLAGS @@ -760,7 +764,6 @@ BUILD_LIBSOUP_GNOME_FALSE BUILD_LIBSOUP_GNOME_TRUE GETTEXT_PACKAGE -DATADIRNAME ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -821,6 +824,7 @@ PKG_CONFIG_PATH PKG_CONFIG CPP +LT_SYS_LIBRARY_PATH OTOOL64 OTOOL LIPO @@ -951,6 +955,7 @@ enable_static with_pic enable_fast_install +with_aix_soname with_gnu_ld with_sysroot enable_libtool_lock @@ -970,6 +975,8 @@ with_apache_module_dir with_ntlm_auth enable_code_coverage +with_gssapi +with_krb5_config enable_more_warnings ' ac_precious_vars='build_alias @@ -980,6 +987,7 @@ LDFLAGS LIBS CPPFLAGS +LT_SYS_LIBRARY_PATH CPP PKG_CONFIG PKG_CONFIG_PATH @@ -1530,7 +1538,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libsoup 2.52.2 to adapt to many kinds of systems. +\`configure' configures libsoup 2.54.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1600,7 +1608,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libsoup 2.52.2:";; + short | recursive ) echo "Configuration of libsoup 2.54.1:";; esac cat <<\_ACEOF @@ -1643,9 +1651,12 @@ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] + --with-aix-soname=aix|svr4|both + shared library versioning (aka "SONAME") variant to + provide on AIX, [default=aix]. --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-sysroot=DIR Search for dependent libraries within DIR - (or the compiler's sysroot if not specified). + --with-sysroot[=DIR] Search for dependent libraries within DIR (or the + compiler's sysroot if not specified). --without-gnome Do not build libsoup-gnome --with-html-dir=PATH path to installed docs --with-apache-httpd Path to apache httpd (for tests) @@ -1653,6 +1664,10 @@ Apache modules dirs (for tests) --with-ntlm-auth=PATH Where to look for ntlm_auth, path points to ntlm_auth installation (default: /usr/bin/ntlm_auth) + --with-gssapi Build with GSSAPI support [default=auto] + --with-krb5-config=PATH Where to look for krb5-config, path points to + krb5-config installation (default: + /usr/kerberos/bin/) Some influential environment variables: CC C compiler command @@ -1662,6 +1677,8 @@ LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory + LT_SYS_LIBRARY_PATH + User-defined run-time library search path. CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH @@ -1744,7 +1761,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libsoup configure 2.52.2 +libsoup configure 2.54.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2022,7 +2039,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libsoup $as_me 2.52.2, which was +It was created by libsoup $as_me 2.54.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2402,7 +2419,7 @@ -am__api_version='1.14' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2574,8 +2591,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2594,7 +2611,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2888,7 +2905,7 @@ # Define the identity of the package. PACKAGE='libsoup' - VERSION='2.52.2' + VERSION='2.54.1' cat >>confdefs.h <<_ACEOF @@ -2922,8 +2939,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2980,6 +2997,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3053,8 +3071,8 @@ SOUP_MAJOR_VERSION=2 -SOUP_MINOR_VERSION=52 -SOUP_MICRO_VERSION=2 +SOUP_MINOR_VERSION=54 +SOUP_MICRO_VERSION=1 @@ -3063,10 +3081,10 @@ # Increment on interface addition. Reset on removal. -SOUP_AGE=7 +SOUP_AGE=8 # Increment on interface add, remove, or change. -SOUP_CURRENT=8 +SOUP_CURRENT=9 # Increment on source change. Reset when CURRENT changes. SOUP_REVISION=0 @@ -4150,8 +4168,8 @@ -macro_version='2.4.2' -macro_revision='1.3337' +macro_version='2.4.6' +macro_revision='2.4.6' @@ -4165,7 +4183,7 @@ -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || @@ -4285,7 +4303,7 @@ $ECHO "" } -case "$ECHO" in +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 @@ -4608,19 +4626,19 @@ # Check whether --with-gnu-ld was given. if test "${with_gnu_ld+set}" = set; then : - withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes + withval=$with_gnu_ld; test no = "$withval" || with_gnu_ld=yes else with_gnu_ld=no fi ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 $as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -4634,7 +4652,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -4645,7 +4663,7 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 $as_echo_n "checking for GNU ld... " >&6; } else @@ -4656,32 +4674,32 @@ $as_echo_n "(cached) " >&6 else if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 &5 $as_echo "$LD" >&6; } @@ -4724,33 +4742,38 @@ else if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -4761,15 +4784,15 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 $as_echo "$lt_cv_path_NM" >&6; } -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + NM=$lt_cv_path_NM else # Didn't find any BSD compatible name lister, look for dumpbin. if test -n "$DUMPBIN"; then : @@ -4875,9 +4898,9 @@ fi fi - case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -4885,8 +4908,8 @@ esac fi - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -4937,7 +4960,7 @@ $as_echo_n "(cached) " >&6 else i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -4977,7 +5000,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -5027,22 +5050,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # 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"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -5060,7 +5084,7 @@ fi -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 $as_echo "$lt_cv_sys_max_cmd_len" >&6; } else @@ -5078,30 +5102,6 @@ : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } -lt_shell_append=no -( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } - - if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else @@ -5224,13 +5224,13 @@ reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in cygwin* | mingw* | pw32* | cegcc*) - if test "$GCC" != yes; then + if test yes != "$GCC"; then reload_cmds=false fi ;; darwin*) - if test "$GCC" = yes; then - reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs' + if test yes = "$GCC"; then + reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs' else reload_cmds='$LD$reload_flag -o $output$reload_objs' fi @@ -5355,13 +5355,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[4-9]*) @@ -5388,8 +5388,7 @@ # 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 @@ -5425,10 +5424,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -5467,7 +5462,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -5489,8 +5484,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' @@ -5543,6 +5538,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac fi @@ -5697,8 +5695,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -5710,7 +5708,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac @@ -5865,7 +5863,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 @@ -5873,7 +5871,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -5886,7 +5884,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 $as_echo "$lt_cv_ar_at_file" >&6; } -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -6103,7 +6101,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -6193,7 +6191,7 @@ symcode='[ABCDGISTW]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[ABCDEGRST]' fi ;; @@ -6226,14 +6224,44 @@ symcode='[ABCDGIRSTW]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -6251,21 +6279,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -6313,11 +6344,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT_DLSYM_CONST #else @@ -6343,7 +6374,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -6363,13 +6394,13 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext}; then + test $ac_status = 0; } && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -6390,7 +6421,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -6443,6 +6474,16 @@ + + + + + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 $as_echo_n "checking for sysroot... " >&6; } @@ -6455,9 +6496,9 @@ lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -6467,8 +6508,8 @@ no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_sysroot" >&5 +$as_echo "$with_sysroot" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac @@ -6480,18 +6521,99 @@ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5 +$as_echo_n "checking for a working dd... " >&6; } +if ${ac_cv_path_lt_DD+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +if test -z "$lt_DD"; then + ac_path_lt_DD_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in dd; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_lt_DD" || continue +if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi + $ac_path_lt_DD_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_lt_DD"; then + : + fi +else + ac_cv_path_lt_DD=$lt_DD +fi + +rm -f conftest.i conftest2.i conftest.out +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5 +$as_echo "$ac_cv_path_lt_DD" >&6; } + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5 +$as_echo_n "checking how to truncate binary pipes... " >&6; } +if ${lt_cv_truncate_bin+:} false; then : + $as_echo_n "(cached) " >&6 +else + printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q" +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5 +$as_echo "$lt_cv_truncate_bin" >&6; } + + + + + + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then : enableval=$enable_libtool_lock; fi -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6500,24 +6622,25 @@ test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '#line '$LINENO' "configure"' > conftest.$ac_ext 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; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -6546,9 +6669,50 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '#line '$LINENO' "configure"' > conftest.$ac_ext + 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; }; then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6562,7 +6726,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -6607,7 +6778,7 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 $as_echo_n "checking whether the C compiler needs -belf... " >&6; } @@ -6647,13 +6818,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 $as_echo "$lt_cv_cc_needs_belf" >&6; } - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 @@ -6665,7 +6837,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -6674,7 +6846,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -6690,7 +6862,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. @@ -6801,7 +6973,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 $as_echo "$lt_cv_path_mainfest_tool" >&6; } -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi @@ -7304,7 +7476,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -7322,7 +7494,7 @@ cat conftest.err >&5 # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -7361,7 +7533,7 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 @@ -7390,7 +7562,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&5 - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -7403,32 +7575,32 @@ $as_echo "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[91]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[012]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[012][,.]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _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" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -7436,6 +7608,41 @@ ;; esac +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8037,14 +8244,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8068,14 +8275,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8099,14 +8306,14 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8114,8 +8321,6 @@ fi -test -z "$pic_mode" && pic_mode=default - @@ -8131,14 +8336,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac else @@ -8152,11 +8357,63 @@ + shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[5-9]*,yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking which variant of shared library versioning to provide" >&5 +$as_echo_n "checking which variant of shared library versioning to provide... " >&6; } + +# Check whether --with-aix-soname was given. +if test "${with_aix_soname+set}" = set; then : + withval=$with_aix_soname; case $withval in + aix|svr4|both) + ;; + *) + as_fn_error $? "Unknown argument to --with-aix-soname" "$LINENO" 5 + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname +else + if ${lt_cv_with_aix_soname+:} false; then : + $as_echo_n "(cached) " >&6 +else + lt_cv_with_aix_soname=aix +fi + + with_aix_soname=$lt_cv_with_aix_soname +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_aix_soname" >&5 +$as_echo "$with_aix_soname" >&6; } + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + + + + + + + # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -8205,7 +8462,7 @@ -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -8244,7 +8501,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -8255,14 +8512,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -8271,15 +8528,8 @@ test -z "$LD" && LD=ld test -z "$ac_objext" && ac_objext=o -for cc_temp in $compiler""; do - case $cc_temp in - compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; - distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +func_cc_basename $compiler +cc_basename=$func_cc_basename_result # Only perform the check for file, if the check method requires it @@ -8294,22 +8544,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" + if test -f "$ac_dir/${ac_tool_prefix}file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"${ac_tool_prefix}file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8332,13 +8582,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8360,22 +8610,22 @@ else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" + if test -f "$ac_dir/file"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"file" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -8398,13 +8648,13 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac fi -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 $as_echo "$MAGIC_CMD" >&6; } @@ -8425,7 +8675,7 @@ # Use C for the default configuration in the libtool script -lt_save_CC="$CC" +lt_save_CC=$CC ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -8487,7 +8737,7 @@ lt_prog_compiler_no_builtin_flag= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;; @@ -8503,7 +8753,7 @@ lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" + lt_compiler_flag="-fno-rtti -fno-exceptions" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8533,7 +8783,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then +if test yes = "$lt_cv_prog_compiler_rtti_exceptions"; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" else : @@ -8551,17 +8801,18 @@ lt_prog_compiler_static= - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_prog_compiler_wl='-Wl,' lt_prog_compiler_static='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' fi + lt_prog_compiler_pic='-fPIC' ;; amigaos*) @@ -8572,8 +8823,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -8589,6 +8840,11 @@ # Although the cygwin gcc ignores -fPIC, still need this for old-style # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -8659,7 +8915,7 @@ case $host_os in aix*) lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor lt_prog_compiler_static='-Bstatic' else @@ -8667,10 +8923,29 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + lt_prog_compiler_pic='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + lt_prog_compiler_wl='-Wl,-Wl,,' + lt_prog_compiler_pic='-PIC' + lt_prog_compiler_static='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' + case $host_os in + os2*) + lt_prog_compiler_static='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -8686,7 +8961,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' + lt_prog_compiler_static='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -8695,9 +8970,9 @@ lt_prog_compiler_static='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) lt_prog_compiler_wl='-Wl,' lt_prog_compiler_pic='-KPIC' @@ -8722,6 +8997,12 @@ lt_prog_compiler_pic='-PIC' lt_prog_compiler_static='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -8819,7 +9100,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then lt_prog_compiler_pic='-Kconform_pic' lt_prog_compiler_static='-Bstatic' fi @@ -8848,7 +9129,7 @@ fi case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) lt_prog_compiler_pic= ;; @@ -8880,7 +9161,7 @@ lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" + lt_compiler_flag="$lt_prog_compiler_pic -DPIC" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -8910,7 +9191,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; } -if test x"$lt_cv_prog_compiler_pic_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_pic_works"; then case $lt_prog_compiler_pic in "" | " "*) ;; *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; @@ -8942,7 +9223,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $lt_tmp_static_flag" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -8961,13 +9242,13 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 $as_echo "$lt_cv_prog_compiler_static_works" >&6; } -if test x"$lt_cv_prog_compiler_static_works" = xyes; then +if test yes = "$lt_cv_prog_compiler_static_works"; then : else lt_prog_compiler_static= @@ -9087,8 +9368,8 @@ -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$lt_cv_prog_compiler_c_o" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 $as_echo_n "checking if we can lock with hard links... " >&6; } @@ -9100,9 +9381,9 @@ ln conftest.a conftest.b 2>/dev/null && hard_links=no { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 $as_echo "$hard_links" >&6; } - if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + if test no = "$hard_links"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -9145,9 +9426,9 @@ # included in the symbol list include_expsyms= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -9162,7 +9443,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -9170,7 +9451,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -9180,7 +9461,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -9202,24 +9483,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - export_dynamic_flag_spec='${wl}--export-dynamic' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + export_dynamic_flag_spec='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + whole_archive_flag_spec=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -9232,7 +9513,7 @@ case $host_os in aix[3-9]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then ld_shlibs=no cat <<_LT_EOF 1>&2 @@ -9251,7 +9532,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9267,7 +9548,7 @@ allow_undefined_flag=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else ld_shlibs=no fi @@ -9277,7 +9558,7 @@ # _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' + export_dynamic_flag_spec='$wl--export-all-symbols' allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes @@ -9285,61 +9566,89 @@ exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname' if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else ld_shlibs=no fi ;; haiku*) - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' link_all_deplibs=yes ;; + os2*) + hardcode_libdir_flag_spec='-L$libdir' + hardcode_minus_L=yes + allow_undefined_flag=unsupported + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes + ;; + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' 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; func_echo_all \"$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' + 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' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -9350,42 +9659,47 @@ lf95*) # Lahey Fortran 8.1 whole_archive_flag_spec= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[cC]* | bgxl[cC]* | mpixl[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' + 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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; 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~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + export_dynamic_flag_spec='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # 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='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; 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' + 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' fi ;; esac @@ -9399,8 +9713,8 @@ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -9418,8 +9732,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9431,7 +9745,7 @@ ld_shlibs=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -9446,9 +9760,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi @@ -9465,15 +9779,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else ld_shlibs=no fi ;; esac - if test "$ld_shlibs" = no; then + if test no = "$ld_shlibs"; then runpath_var= hardcode_libdir_flag_spec= export_dynamic_flag_spec= @@ -9489,7 +9803,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. hardcode_direct=unsupported @@ -9497,34 +9811,57 @@ ;; aix[4-9]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= 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". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. 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") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -9543,13 +9880,21 @@ hardcode_direct_absolute=yes hardcode_libdir_separator=':' link_all_deplibs=yes - file_list_spec='${wl}-f,' + file_list_spec='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + hardcode_direct=no + hardcode_direct_absolute=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[012]|aix4.[012].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -9568,35 +9913,42 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - export_dynamic_flag_spec='${wl}-bexpall' + export_dynamic_flag_spec='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. allow_undefined_flag='-berok' # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9631,7 +9983,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9639,17 +9991,17 @@ aix_libpath=$lt_cv_aix_libpath_ 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" + 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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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' + if test ia64 = "$host_cpu"; then + hardcode_libdir_flag_spec='$wl-R $libdir:/usr/lib:/lib' allow_undefined_flag="-z nodefs" - archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. - if test "${lt_cv_aix_libpath+set}" = set; then + if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else if ${lt_cv_aix_libpath_+:} false; then : @@ -9684,7 +10036,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then - lt_cv_aix_libpath_="/usr/lib:/lib" + lt_cv_aix_libpath_=/usr/lib:/lib fi fi @@ -9692,21 +10044,33 @@ aix_libpath=$lt_cv_aix_libpath_ fi - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" + hardcode_libdir_flag_spec='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + no_undefined_flag=' $wl-bernotok' + allow_undefined_flag=' $wl-berok' + if test yes = "$with_gnu_ld"; 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' + 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 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' + archive_expsym_cmds='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([, ]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + archive_expsym_cmds="$archive_expsym_cmds"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + archive_expsym_cmds="$archive_expsym_cmds"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + archive_expsym_cmds="$archive_expsym_cmds"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -9715,7 +10079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' archive_expsym_cmds='' ;; m68k) @@ -9745,16 +10109,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + archive_expsym_cmds='if test DEF = "`$SED -n -e '\''s/^[ ]*//'\'' -e '\''/^\(;.*\)*$/d'\'' -e '\''s/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p'\'' -e q $export_symbols`" ; then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes @@ -9763,18 +10128,18 @@ # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' postlink_cmds='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -9783,7 +10148,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -9802,24 +10167,24 @@ 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\"`' + if test yes = "$lt_cv_ld_force_load"; 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 link_all_deplibs=yes - allow_undefined_flag="$_lt_dar_allow_undefined" + allow_undefined_flag=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - 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}" - module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + 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" + module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -9861,33 +10226,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + archive_cmds='$CC -shared $pic_flag $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 - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. hardcode_minus_L=yes @@ -9895,25 +10260,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) @@ -9925,7 +10290,7 @@ $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler__b=no - save_LDFLAGS="$LDFLAGS" + 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 @@ -9944,14 +10309,14 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + 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' +if test yes = "$lt_cv_prog_compiler__b"; 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 @@ -9959,8 +10324,8 @@ ;; esac fi - if test "$with_gnu_ld" = no; then - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + hardcode_libdir_flag_spec='$wl+b $wl$libdir' hardcode_libdir_separator=: case $host_cpu in @@ -9971,7 +10336,7 @@ *) hardcode_direct=yes hardcode_direct_absolute=yes - export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -9982,8 +10347,8 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # 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. @@ -9993,8 +10358,8 @@ if ${lt_cv_irix_exported_symbol+:} false; then : $as_echo_n "(cached) " >&6 else - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } @@ -10006,24 +10371,34 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 $as_echo "$lt_cv_irix_exported_symbol" >&6; } - if test "$lt_cv_irix_exported_symbol" = yes; then - archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + if test yes = "$lt_cv_irix_exported_symbol"; then + archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi 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" && 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' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: inherit_rpath=yes link_all_deplibs=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + ld_shlibs=yes + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out @@ -10038,7 +10413,7 @@ newsos6) archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: hardcode_shlibpath_var=no ;; @@ -10046,27 +10421,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then hardcode_direct=yes hardcode_shlibpath_var=no hardcode_direct_absolute=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' + export_dynamic_flag_spec='$wl-E' else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath,$libdir' fi else ld_shlibs=no @@ -10077,33 +10444,53 @@ 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' - old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + archive_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + archive_expsym_cmds='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + enable_shared_with_static_runtimes=yes ;; 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' + if test yes = "$GCC"; 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' 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" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' fi archive_cmds_need_lc='no' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' hardcode_libdir_separator=: ;; 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} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + allow_undefined_flag=' $wl-expect_unresolved $wl\*' + archive_cmds='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + 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" && func_echo_all "-set_version $verstring"` -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 "-set_version $verstring"` -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' @@ -10114,24 +10501,24 @@ solaris*) no_undefined_flag=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + archive_cmds='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + archive_cmds='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + archive_cmds='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -10141,11 +10528,11 @@ solaris2.[0-5] | solaris2.[0-5].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + whole_archive_flag_spec='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else whole_archive_flag_spec='-z allextract$convenience -z defaultextract' fi @@ -10155,10 +10542,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -10207,43 +10594,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) - no_undefined_flag='${wl}-z,text' + no_undefined_flag='$wl-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - no_undefined_flag='${wl}-z,text' - allow_undefined_flag='${wl}-z,nodefs' + no_undefined_flag='$wl-z,text' + allow_undefined_flag='$wl-z,nodefs' archive_cmds_need_lc=no hardcode_shlibpath_var=no - hardcode_libdir_flag_spec='${wl}-R,$libdir' + hardcode_libdir_flag_spec='$wl-R,$libdir' hardcode_libdir_separator=':' link_all_deplibs=yes - export_dynamic_flag_spec='${wl}-Bexport' + export_dynamic_flag_spec='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + archive_cmds='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' fi ;; @@ -10258,10 +10645,10 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - export_dynamic_flag_spec='${wl}-Blargedynsym' + export_dynamic_flag_spec='$wl-Blargedynsym' ;; esac fi @@ -10269,7 +10656,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 $as_echo "$ld_shlibs" >&6; } -test "$ld_shlibs" = no && can_build_shared=no +test no = "$ld_shlibs" && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10295,7 +10682,7 @@ # Assume -lc should be added archive_cmds_need_lc=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $archive_cmds in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -10510,14 +10897,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + 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" ;; + 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 @@ -10533,28 +10920,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ 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 ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -10568,7 +10962,7 @@ # 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'` ;; + $SED 's|/\([A-Za-z]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -10577,7 +10971,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -10594,14 +10988,16 @@ # flags to be left without arguments need_version=unknown + + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[4-9]*) @@ -10609,41 +11005,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[01] | aix4.[01].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a(lib.so.V)' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V($shared_archive_member_spec.o), lib.a(lib.so.V)" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a(lib.so.V), lib.so.V($shared_archive_member_spec.o)" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -10653,18 +11099,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; 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=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; $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 ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -10672,8 +11118,8 @@ bsdi[45]*) version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -10685,7 +11131,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -10694,8 +11140,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -10711,17 +11157,17 @@ case $host_os in 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}' + 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" ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -10730,8 +11176,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -10758,7 +11204,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -10771,8 +11217,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -10785,7 +11231,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -10798,8 +11244,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -10812,8 +11258,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + 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 ;; @@ -10831,12 +11277,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -10861,26 +11308,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - 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 - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor 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' + 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 + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -10898,14 +11334,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -10913,8 +11350,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -10923,8 +11360,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -10937,8 +11374,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -10949,7 +11386,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -10957,8 +11394,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -10977,8 +11414,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -10987,13 +11424,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # 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 + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + hardcode_libdir_flag_spec='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -11040,11 +11497,15 @@ # 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 + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) 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" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11061,12 +11522,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -11076,7 +11537,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -11085,58 +11546,68 @@ version_type=qnx 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' + 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='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[89] | openbsd2.[89].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -11147,8 +11618,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + 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=yes hardcode_into_libs=yes @@ -11158,11 +11629,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -11170,8 +11641,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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 case $host_vendor in sni) @@ -11192,24 +11663,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -11227,7 +11698,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -11235,8 +11706,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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 ;; @@ -11246,20 +11717,35 @@ esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 $as_echo "$dynamic_linker" >&6; } -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + + + + + + @@ -11356,15 +11842,15 @@ hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || - test "X$hardcode_automatic" = "Xyes" ; then + test yes = "$hardcode_automatic"; then # We can hardcode non-existent directories. - if test "$hardcode_direct" != no && + if test no != "$hardcode_direct" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, )" && + test no != "$hardcode_minus_L"; then # Linking always hardcodes the temporary library directory. hardcode_action=relink else @@ -11379,12 +11865,12 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 $as_echo "$hardcode_action" >&6; } -if test "$hardcode_action" = relink || - test "$inherit_rpath" = yes; then +if test relink = "$hardcode_action" || + test yes = "$inherit_rpath"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -11394,7 +11880,7 @@ - if test "x$enable_dlopen" != xyes; then + if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -11404,23 +11890,23 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } if ${ac_cv_lib_dl_dlopen+:} false; then : @@ -11458,10 +11944,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else - lt_cv_dlopen="dyld" + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes @@ -11469,10 +11955,18 @@ ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" if test "x$ac_cv_func_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" + lt_cv_dlopen=shl_load else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 $as_echo_n "checking for shl_load in -ldld... " >&6; } @@ -11511,11 +12005,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 $as_echo "$ac_cv_lib_dld_shl_load" >&6; } if test "x$ac_cv_lib_dld_shl_load" = xyes; then : - lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld else ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" if test "x$ac_cv_func_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } @@ -11554,7 +12048,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } if test "x$ac_cv_lib_dl_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 $as_echo_n "checking for dlopen in -lsvld... " >&6; } @@ -11593,7 +12087,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 $as_echo "$ac_cv_lib_svld_dlopen" >&6; } if test "x$ac_cv_lib_svld_dlopen" = xyes; then : - lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 $as_echo_n "checking for dld_link in -ldld... " >&6; } @@ -11632,7 +12126,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 $as_echo "$ac_cv_lib_dld_dld_link" >&6; } if test "x$ac_cv_lib_dld_dld_link" = xyes; then : - lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" + lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld fi @@ -11653,21 +12147,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 @@ -11675,7 +12169,7 @@ if ${lt_cv_dlopen_self+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11722,9 +12216,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11754,7 +12248,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11774,14 +12268,14 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 $as_echo "$lt_cv_dlopen_self" >&6; } - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if ${lt_cv_dlopen_self_static+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : + if test yes = "$cross_compiling"; then : lt_cv_dlopen_self_static=cross else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -11828,9 +12322,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -11860,7 +12354,7 @@ (eval $ac_link) 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then + test $ac_status = 0; } && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? case x$lt_status in @@ -11881,9 +12375,9 @@ $as_echo "$lt_cv_dlopen_self_static" >&6; } fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -11927,7 +12421,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -11955,7 +12449,7 @@ - # Report which library types will actually be built + # Report what library types will actually be built { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 $as_echo_n "checking if libtool supports shared libraries... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 @@ -11963,13 +12457,13 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 $as_echo_n "checking whether to build shared libraries... " >&6; } - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -11977,8 +12471,12 @@ ;; aix[4-9]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -11988,7 +12486,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 $as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 $as_echo "$enable_static" >&6; } @@ -12002,7 +12500,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CC="$lt_save_CC" +CC=$lt_save_CC @@ -13196,44 +13694,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - @@ -13287,10 +13747,13 @@ +# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have +# it on it's own line. - gtk_doc_requires="gtk-doc >= 1.10" + + gtk_doc_requires="gtk-doc >= 1.20" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk-doc" >&5 $as_echo_n "checking for gtk-doc... " >&6; } if test -n "$PKG_CONFIG" && \ @@ -13661,6 +14124,7 @@ + # Check whether --enable-introspection was given. if test "${enable_introspection+set}" = set; then : enableval=$enable_introspection; @@ -13752,6 +14216,9 @@ +if test "$found_introspection" != "yes" -a "$enable_vala" = ""; then + enable_vala=no +fi # Extract the first word of "valac", so it can be a program name with args. set dummy valac; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -14663,6 +15130,86 @@ +# Check whether --with-gssapi was given. +if test "${with_gssapi+set}" = set; then : + withval=$with_gssapi; +fi + + +if test "$with_gssapi" != "no"; then + +# Check whether --with-krb5-config was given. +if test "${with_krb5_config+set}" = set; then : + withval=$with_krb5_config; KRB5_CONFIG="$withval" +else + for ac_prog in krb5-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_KRB5_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $KRB5_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="${PATH}:/usr/kerberos/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG +if test -n "$KRB5_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KRB5_CONFIG" >&5 +$as_echo "$KRB5_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$KRB5_CONFIG" && break +done +test -n "$KRB5_CONFIG" || KRB5_CONFIG="no" + +fi + + + if test "$KRB5_CONFIG" != "no"; then + KRB5_LIBS="`${KRB5_CONFIG} --libs gssapi`" + KRB5_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" + + + if test "$KRB5_CONFIG" != none; then + +$as_echo "#define LIBSOUP_HAVE_GSSAPI 1" >>confdefs.h + + fi + else + if test "$with_gssapi" = "yes"; then + as_fn_error $? "GSSAPI support requested but failed to found krb5-config. Try to set KRB5_CONFIG." "$LINENO" 5 + fi + fi +fi + + # Check whether --enable-more-warnings was given. if test "${enable_more_warnings+set}" = set; then : enableval=$enable_more_warnings; set_more_warnings=no @@ -14679,10 +15226,62 @@ -Werror=declaration-after-statement" fi +################################################## +# Visibility handling +################################################## + +SOUP_HIDDEN_VISIBILITY_CFLAGS="" +case "$host" in + *-*-mingw*) + +$as_echo "#define _SOUP_EXTERN __attribute__((visibility(\"default\"))) __declspec(dllexport) extern" >>confdefs.h + + SOUP_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" + ;; + *) + SAVED_CFLAGS="${CFLAGS}" + CFLAGS="-fvisibility=hidden" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -fvisibility=hidden compiler flag" >&5 +$as_echo_n "checking for -fvisibility=hidden compiler flag... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +int main (void) { return 0; } + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + enable_fvisibility_hidden=yes +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + enable_fvisibility_hidden=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="${SAVED_CFLAGS}" + + if test "${enable_fvisibility_hidden}" = "yes"; then : + + +$as_echo "#define _SOUP_EXTERN __attribute__((visibility(\"default\"))) extern" >>confdefs.h + + SOUP_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" + +fi + ;; +esac + + ac_config_headers="$ac_config_headers config.h" -ac_config_files="$ac_config_files libsoup-2.4.pc libsoup-gnome-2.4.pc Makefile libsoup-zip libsoup/Makefile po/Makefile.in po/Makefile tests/Makefile examples/Makefile docs/Makefile docs/reference/Makefile libsoup/soup-version.h" +ac_config_files="$ac_config_files libsoup-2.4.pc libsoup-gnome-2.4.pc Makefile libsoup-zip libsoup/Makefile po/Makefile.in po/Makefile tests/Makefile examples/Makefile docs/Makefile docs/reference/Makefile libsoup/soup-version.h config.h.win32 build/win32/Makefile build/win32/vs9/Makefile build/win32/vs9/soup-gen-srcs.vsprops build/win32/vs10/Makefile build/win32/vs10/soup-gen-srcs.props build/win32/vs11/Makefile build/win32/vs12/Makefile build/win32/vs14/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -15286,7 +15885,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libsoup $as_me 2.52.2, which was +This file was extended by libsoup $as_me 2.54.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15352,7 +15951,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libsoup config.status 2.52.2 +libsoup config.status 2.54.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15490,6 +16089,7 @@ 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"`' +shared_archive_member_spec='`$ECHO "$shared_archive_member_spec" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' @@ -15537,10 +16137,13 @@ 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_import='`$ECHO "$lt_cv_sys_global_symbol_to_import" | $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"`' +lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`' nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`' lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`' +lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $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"`' @@ -15605,7 +16208,8 @@ 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"`' +configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' +configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $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"`' @@ -15657,9 +16261,12 @@ compiler \ lt_cv_sys_global_symbol_pipe \ lt_cv_sys_global_symbol_to_cdecl \ +lt_cv_sys_global_symbol_to_import \ lt_cv_sys_global_symbol_to_c_name_address \ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \ +lt_cv_nm_interface \ nm_file_list_spec \ +lt_cv_truncate_bin \ lt_prog_compiler_no_builtin_flag \ lt_prog_compiler_pic \ lt_prog_compiler_wl \ @@ -15694,7 +16301,7 @@ striplib; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -15721,10 +16328,11 @@ postuninstall_cmds \ finish_cmds \ sys_lib_search_path_spec \ -sys_lib_dlsearch_path_spec; do +configure_time_dlsearch_path \ +configure_time_lt_sys_library_path; do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[\\\\\\\`\\"\\\$]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -15733,19 +16341,16 @@ done ac_aux_dir='$ac_aux_dir' -xsi_shell='$xsi_shell' -lt_shell_append='$lt_shell_append' -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -15775,6 +16380,15 @@ "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;; "docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES docs/reference/Makefile" ;; "libsoup/soup-version.h") CONFIG_FILES="$CONFIG_FILES libsoup/soup-version.h" ;; + "config.h.win32") CONFIG_FILES="$CONFIG_FILES config.h.win32" ;; + "build/win32/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/Makefile" ;; + "build/win32/vs9/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs9/Makefile" ;; + "build/win32/vs9/soup-gen-srcs.vsprops") CONFIG_FILES="$CONFIG_FILES build/win32/vs9/soup-gen-srcs.vsprops" ;; + "build/win32/vs10/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs10/Makefile" ;; + "build/win32/vs10/soup-gen-srcs.props") CONFIG_FILES="$CONFIG_FILES build/win32/vs10/soup-gen-srcs.props" ;; + "build/win32/vs11/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs11/Makefile" ;; + "build/win32/vs12/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs12/Makefile" ;; + "build/win32/vs14/Makefile") CONFIG_FILES="$CONFIG_FILES build/win32/vs14/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; @@ -16466,55 +17080,53 @@ ;; "libtool":C) - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + +# Copyright (C) 2014 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. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # The names of the tagged configurations supported by this script. -available_tags="" +available_tags='' + +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} # ### BEGIN LIBTOOL CONFIG @@ -16543,6 +17155,9 @@ # Whether or not to optimize for fast installation. fast_install=$enable_fast_install +# Shared archive member basename,for filename based shared library versioning on AIX. +shared_archive_member_spec=$shared_archive_member_spec + # Shell to use when invoking shell scripts. SHELL=$lt_SHELL @@ -16654,18 +17269,27 @@ # Transform the output of nm in a proper C declaration. global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +# Transform the output of nm into a list of symbols to manually relocate. +global_symbol_to_import=$lt_lt_cv_sys_global_symbol_to_import + # Transform the output of nm in a C name address pair. global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address # Transform the output of nm in a C name address pair when lib prefix is needed. global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +# The name lister interface. +nm_interface=$lt_lt_cv_nm_interface + # Specify filename containing input files for \$NM. nm_file_list_spec=$lt_nm_file_list_spec -# The root where to search for dependent libraries,and in which our libraries should be installed. +# The root where to search for dependent libraries,and where our libraries should be installed. lt_sysroot=$lt_sysroot +# Command to truncate a binary pipe. +lt_truncate_bin=$lt_lt_cv_truncate_bin + # The name of the directory that contains temporary libtool files. objdir=$objdir @@ -16756,8 +17380,11 @@ # Compile-time system search path for libraries. sys_lib_search_path_spec=$lt_sys_lib_search_path_spec -# Run-time system search path for libraries. -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +# Detected run-time system search path for libraries. +sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path + +# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. +configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path # Whether dlopen is supported. dlopen_support=$enable_dlopen @@ -16850,13 +17477,13 @@ # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary. hardcode_direct=$hardcode_direct -# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +# Set to "yes" if using DIR/libNAME\$shared_ext during linking hardcodes # DIR into the resulting binary and the resulting library dependency is -# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +# "absolute",i.e impossible to change by setting \$shlibpath_var if the # library is relocated. hardcode_direct_absolute=$hardcode_direct_absolute @@ -16908,13 +17535,72 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x$2 in + x) + ;; + *:) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" + ;; + x:*) + eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" + ;; + *) + eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" + ;; + esac +} + + +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in $*""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} + + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -16923,7 +17609,7 @@ esac -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh # We use sed instead of cat because bash on DJGPP gets confused if @@ -16933,165 +17619,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - if test x"$xsi_shell" = xyes; then - sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ -func_dirname ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_basename ()$/,/^} # func_basename /c\ -func_basename ()\ -{\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ -func_dirname_and_basename ()\ -{\ -\ case ${1} in\ -\ */*) func_dirname_result="${1%/*}${2}" ;;\ -\ * ) func_dirname_result="${3}" ;;\ -\ esac\ -\ func_basename_result="${1##*/}"\ -} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ -func_stripname ()\ -{\ -\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ -\ # positional parameters, so assign one to ordinary parameter first.\ -\ func_stripname_result=${3}\ -\ func_stripname_result=${func_stripname_result#"${1}"}\ -\ func_stripname_result=${func_stripname_result%"${2}"}\ -} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ -func_split_long_opt ()\ -{\ -\ func_split_long_opt_name=${1%%=*}\ -\ func_split_long_opt_arg=${1#*=}\ -} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ -func_split_short_opt ()\ -{\ -\ func_split_short_opt_arg=${1#??}\ -\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ -} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ -func_lo2o ()\ -{\ -\ case ${1} in\ -\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ -\ *) func_lo2o_result=${1} ;;\ -\ esac\ -} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_xform ()$/,/^} # func_xform /c\ -func_xform ()\ -{\ - func_xform_result=${1%.*}.lo\ -} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_arith ()$/,/^} # func_arith /c\ -func_arith ()\ -{\ - func_arith_result=$(( $* ))\ -} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_len ()$/,/^} # func_len /c\ -func_len ()\ -{\ - func_len_result=${#1}\ -} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - -fi - -if test x"$lt_shell_append" = xyes; then - sed -e '/^func_append ()$/,/^} # func_append /c\ -func_append ()\ -{\ - eval "${1}+=\\${2}"\ -} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ -func_append_quoted ()\ -{\ -\ func_quote_for_eval "${2}"\ -\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ -} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: - - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} -fi - - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" diff -Nru libsoup2.4-2.52.2/configure.ac libsoup2.4-2.54.1/configure.ac --- libsoup2.4-2.52.2/configure.ac 2015-11-09 20:23:00.000000000 +0000 +++ libsoup2.4-2.54.1/configure.ac 2016-04-25 20:30:33.000000000 +0000 @@ -3,8 +3,8 @@ dnl ******************************************* m4_define([soup_major_version], [2]) -m4_define([soup_minor_version], [52]) -m4_define([soup_micro_version], [2]) +m4_define([soup_minor_version], [54]) +m4_define([soup_micro_version], [1]) AC_PREREQ(2.63) AC_INIT([libsoup],[soup_major_version.soup_minor_version.soup_micro_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup]) @@ -28,10 +28,10 @@ AC_SUBST(SOUP_API_VERSION) # Increment on interface addition. Reset on removal. -SOUP_AGE=7 +SOUP_AGE=8 # Increment on interface add, remove, or change. -SOUP_CURRENT=8 +SOUP_CURRENT=9 # Increment on source change. Reset when CURRENT changes. SOUP_REVISION=0 @@ -155,13 +155,20 @@ dnl *************** dnl *** gtk-doc *** dnl *************** -GTK_DOC_CHECK([1.10]) +# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have +# it on it's own line. +m4_ifdef([GTK_DOC_CHECK], [ +GTK_DOC_CHECK([1.20], [--flavour no-tmpl]) +],[]) dnl ***************************** dnl *** gobject-introspection *** dnl ***************************** GOBJECT_INTROSPECTION_CHECK([0.9.5]) +if test "$found_introspection" != "yes" -a "$enable_vala" = ""; then + enable_vala=no +fi VAPIGEN_CHECK() AC_MSG_CHECKING([for glib-networking (glib TLS implementation)]) @@ -317,6 +324,34 @@ AX_CODE_COVERAGE +dnl ********************** +dnl *** GSSAPI support *** +dnl ********************** +AC_ARG_WITH(gssapi, + AS_HELP_STRING([--with-gssapi], + [Build with GSSAPI support [default=auto]])) + +if test "$with_gssapi" != "no"; then + AC_ARG_WITH(krb5-config, + AS_HELP_STRING([--with-krb5-config=PATH],[Where to look for krb5-config, path points to krb5-config installation (default: /usr/kerberos/bin/)]), + KRB5_CONFIG="$withval", + [AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no, ${PATH}:/usr/kerberos/bin)]) + + if test "$KRB5_CONFIG" != "no"; then + KRB5_LIBS="`${KRB5_CONFIG} --libs gssapi`" + KRB5_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" + AC_SUBST(KRB5_CFLAGS) + AC_SUBST(KRB5_LIBS) + if test "$KRB5_CONFIG" != none; then + AC_DEFINE(LIBSOUP_HAVE_GSSAPI, 1, [Whether or not GSSAPI libs are available]) + fi + else + if test "$with_gssapi" = "yes"; then + AC_MSG_ERROR([GSSAPI support requested but failed to found krb5-config. Try to set KRB5_CONFIG.]) + fi + fi +fi + dnl **************************************************** dnl *** Warnings to show if using GCC *** dnl *** (do this last so -Werror won't mess up tests *** @@ -336,6 +371,39 @@ -Werror=declaration-after-statement" fi +################################################## +# Visibility handling +################################################## + +SOUP_HIDDEN_VISIBILITY_CFLAGS="" +case "$host" in + *-*-mingw*) + dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport) + AC_DEFINE([_SOUP_EXTERN], [__attribute__((visibility("default"))) __declspec(dllexport) extern], + [defines how to decorate public symbols while building]) + SOUP_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" + ;; + *) + dnl on other compilers, check if we can do -fvisibility=hidden + SAVED_CFLAGS="${CFLAGS}" + CFLAGS="-fvisibility=hidden" + AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) + AC_TRY_COMPILE([], [int main (void) { return 0; }], + AC_MSG_RESULT(yes) + enable_fvisibility_hidden=yes, + AC_MSG_RESULT(no) + enable_fvisibility_hidden=no) + CFLAGS="${SAVED_CFLAGS}" + + AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [ + AC_DEFINE([_SOUP_EXTERN], [__attribute__((visibility("default"))) extern], + [defines how to decorate public symbols while building]) + SOUP_HIDDEN_VISIBILITY_CFLAGS="-fvisibility=hidden" + ]) + ;; +esac +AC_SUBST(SOUP_HIDDEN_VISIBILITY_CFLAGS) + dnl ************************* dnl *** Output Everything *** dnl ************************* @@ -354,5 +422,14 @@ docs/Makefile docs/reference/Makefile libsoup/soup-version.h + config.h.win32 + build/win32/Makefile + build/win32/vs9/Makefile + build/win32/vs9/soup-gen-srcs.vsprops + build/win32/vs10/Makefile + build/win32/vs10/soup-gen-srcs.props + build/win32/vs11/Makefile + build/win32/vs12/Makefile + build/win32/vs14/Makefile ]) AC_OUTPUT diff -Nru libsoup2.4-2.52.2/debian/changelog libsoup2.4-2.54.1/debian/changelog --- libsoup2.4-2.52.2/debian/changelog 2015-11-10 22:13:42.000000000 +0000 +++ libsoup2.4-2.54.1/debian/changelog 2016-04-27 12:25:25.000000000 +0000 @@ -1,3 +1,41 @@ +libsoup2.4 (2.54.1-1) unstable; urgency=medium + + * New upstream release. Really closes: #821274, the previous upload was + actually missing the patch. + * Bump Standards-Version to 3.9.8. + + -- Michael Biebl Wed, 27 Apr 2016 14:25:24 +0200 + +libsoup2.4 (2.54.0.1-2) unstable; urgency=medium + + * Fix SoupAuthClass size to undo ABI break with 2.54.0. Patch cherry-picked + from upstream Git. (Closes: #821274) + + -- Michael Biebl Mon, 25 Apr 2016 18:35:49 +0200 + +libsoup2.4 (2.54.0.1-1) unstable; urgency=medium + + * New upstream release. + * Drop libsoup2.4-dbg package now that we have automatic dbgsym packages. + * Ensure proper upgrade from libsoup2.4-dbg to new dbgsym packages by using + dh_strip --dbgsym-migration. Bump Build-Depends on debhelper accordingly. + * Add Homepage: field. + * Use dbus-run-session to run the test suite and drop the no longer needed + Build-Depends on xvfb, xauth and dbus-x11. + * Switch from heimdal to krb5, which appears to be the more widely used + Kerberos implementation. + + -- Michael Biebl Sat, 16 Apr 2016 03:36:35 +0200 + +libsoup2.4 (2.53.92-1) experimental; urgency=medium + + * New upstream release. + * Bump Standards-Version to 3.9.7 + * Add heimdal-dev build-dependency to enable GSS-Negotiate support + * Update debian/libsoup2.4-1.symbols with three new additions + + -- Andreas Henriksson Mon, 14 Mar 2016 21:02:06 +0100 + libsoup2.4 (2.52.2-1) unstable; urgency=medium * New upstream release. diff -Nru libsoup2.4-2.52.2/debian/control libsoup2.4-2.54.1/debian/control --- libsoup2.4-2.52.2/debian/control 2015-11-10 22:14:05.000000000 +0000 +++ libsoup2.4-2.54.1/debian/control 2016-04-27 12:34:28.000000000 +0000 @@ -6,8 +6,8 @@ Section: devel Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl , Sjoerd Simons -Build-Depends: debhelper (>= 9), +Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Iain Lane , Michael Biebl +Build-Depends: debhelper (>= 9.20160114), dh-autoreconf, cdbs (>= 0.4.93~), gnome-pkg-tools, @@ -16,20 +16,19 @@ glib-networking (>= 2.32.0), libsqlite3-dev, libxml2-dev, + libkrb5-dev, gtk-doc-tools, shared-mime-info, libgirepository1.0-dev (>= 0.9.5), gobject-introspection (>= 0.9.12-4~), dbus, - dbus-x11, - xvfb, - xauth, curl, valac Build-Depends-Indep: libglib2.0-doc Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libsoup2.4 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libsoup2.4 -Standards-Version: 3.9.6 +Homepage: https://wiki.gnome.org/Projects/libsoup +Standards-Version: 3.9.8 Package: libsoup2.4-dev Architecture: any @@ -92,34 +91,6 @@ . This package contains the shared library. -Package: libsoup2.4-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libsoup2.4-1 (= ${binary:Version}), - ${misc:Depends} -Description: HTTP library implementation in C -- debugging symbols - It was originally part of a SOAP (Simple Object Access Protocol) - implementation called Soup, but the SOAP and non-SOAP parts have now been - split into separate packages. - . - libsoup uses the Glib main loop and is designed to work well with GTK+ - applications. This enables GNOME applications to access HTTP servers - on the network in a completely asynchronous fashion, very similar to - the GTK+ programming model (a synchronous operation mode is also - supported for those who want it). - . - Features: - * Both asynchronous (GMainLoop and callback-based) and synchronous APIs - * Automatically caches connections - * SSL Support using GnuTLS. - * Proxy support, including authentication and SSL tunneling - * Client support for Digest, NTLM, and Basic authentication - * Server support for Digest and Basic authentication - * Basic client-side SOAP and XML-RPC support - . - This package contains the debugging symbols. - Package: libsoup-gnome2.4-1 Section: libs Architecture: any diff -Nru libsoup2.4-2.52.2/debian/control.in libsoup2.4-2.54.1/debian/control.in --- libsoup2.4-2.52.2/debian/control.in 2015-10-13 19:24:23.000000000 +0000 +++ libsoup2.4-2.54.1/debian/control.in 2016-04-27 12:24:35.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 9.20160114), dh-autoreconf, cdbs (>= 0.4.93~), gnome-pkg-tools, @@ -12,20 +12,19 @@ glib-networking (>= 2.32.0), libsqlite3-dev, libxml2-dev, + libkrb5-dev, gtk-doc-tools, shared-mime-info, libgirepository1.0-dev (>= 0.9.5), gobject-introspection (>= 0.9.12-4~), dbus, - dbus-x11, - xvfb, - xauth, curl, valac Build-Depends-Indep: libglib2.0-doc Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/libsoup2.4 Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/libsoup2.4 -Standards-Version: 3.9.6 +Homepage: https://wiki.gnome.org/Projects/libsoup +Standards-Version: 3.9.8 Package: libsoup2.4-dev Architecture: any @@ -88,34 +87,6 @@ . This package contains the shared library. -Package: libsoup2.4-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libsoup2.4-1 (= ${binary:Version}), - ${misc:Depends} -Description: HTTP library implementation in C -- debugging symbols - It was originally part of a SOAP (Simple Object Access Protocol) - implementation called Soup, but the SOAP and non-SOAP parts have now been - split into separate packages. - . - libsoup uses the Glib main loop and is designed to work well with GTK+ - applications. This enables GNOME applications to access HTTP servers - on the network in a completely asynchronous fashion, very similar to - the GTK+ programming model (a synchronous operation mode is also - supported for those who want it). - . - Features: - * Both asynchronous (GMainLoop and callback-based) and synchronous APIs - * Automatically caches connections - * SSL Support using GnuTLS. - * Proxy support, including authentication and SSL tunneling - * Client support for Digest, NTLM, and Basic authentication - * Server support for Digest and Basic authentication - * Basic client-side SOAP and XML-RPC support - . - This package contains the debugging symbols. - Package: libsoup-gnome2.4-1 Section: libs Architecture: any diff -Nru libsoup2.4-2.52.2/debian/libsoup2.4-1.symbols libsoup2.4-2.54.1/debian/libsoup2.4-1.symbols --- libsoup2.4-2.52.2/debian/libsoup2.4-1.symbols 2015-09-30 21:22:56.000000000 +0000 +++ libsoup2.4-2.54.1/debian/libsoup2.4-1.symbols 2016-04-15 23:40:19.000000000 +0000 @@ -46,6 +46,7 @@ soup_address_resolve_sync@Base 2.4.0 soup_auth_authenticate@Base 2.4.0 soup_auth_basic_get_type@Base 2.4.0 + soup_auth_can_authenticate@Base 2.53.92 soup_auth_digest_get_type@Base 2.4.0 soup_auth_domain_accepts@Base 2.4.0 soup_auth_domain_add_path@Base 2.4.0 @@ -81,6 +82,8 @@ soup_auth_is_ready@Base 2.41.90 soup_auth_manager_get_type@Base 2.24.3 soup_auth_manager_use_auth@Base 2.41.90 + soup_auth_negotiate_get_type@Base 2.53.92 + soup_auth_negotiate_supported@Base 2.53.92 soup_auth_new@Base 2.4.0 soup_auth_ntlm_get_type@Base 2.4.0 soup_auth_save_password@Base 2.28.0 diff -Nru libsoup2.4-2.52.2/debian/rules libsoup2.4-2.54.1/debian/rules --- libsoup2.4-2.52.2/debian/rules 2015-11-10 22:13:12.000000000 +0000 +++ libsoup2.4-2.54.1/debian/rules 2016-04-16 00:18:52.000000000 +0000 @@ -13,6 +13,8 @@ DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4 +DEB_DH_STRIP_ARGS = --dbgsym-migration='libsoup2.4-dbg (<< 2.54.0.1-1~)' + DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) @@ -21,7 +23,7 @@ common-build-arch common-build-indep:: debian/stamp-makefile-check debian/stamp-makefile-check: debian/stamp-makefile-build mkdir -p $(CHECK_HOME) - env HOME=$(CHECK_HOME) XDG_RUNTIME_DIR=$(CHECK_HOME) xvfb-run -s -noreset $(MAKE) check VERBOSE=1 + env HOME=$(CHECK_HOME) XDG_RUNTIME_DIR=$(CHECK_HOME) dbus-run-session -- $(MAKE) check VERBOSE=1 touch $@ makefile-clean:: diff -Nru libsoup2.4-2.52.2/docs/Makefile.in libsoup2.4-2.54.1/docs/Makefile.in --- libsoup2.4-2.52.2/docs/Makefile.in 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/docs/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -78,7 +88,6 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ @@ -89,6 +98,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -148,6 +158,7 @@ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -199,7 +210,6 @@ CPPFLAGS = @CPPFLAGS@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -252,6 +262,9 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -261,6 +274,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -292,6 +306,7 @@ SOUP_API_VERSION = @SOUP_API_VERSION@ SOUP_CURRENT = @SOUP_CURRENT@ SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ @@ -382,7 +397,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign docs/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -677,6 +691,8 @@ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libsoup2.4-2.52.2/docs/reference/html/annotation-glossary.html libsoup2.4-2.54.1/docs/reference/html/annotation-glossary.html --- libsoup2.4-2.52.2/docs/reference/html/annotation-glossary.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/annotation-glossary.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,12 +2,12 @@ -libsoup Reference Manual: Annotation Glossary +Annotation Glossary: libsoup Reference Manual - + @@ -22,6 +22,8 @@  |  O  |  + R +  |  S  |  T @@ -50,11 +52,16 @@

O

out

Parameter for returning results. Default is transfer full.

+

R

+
rename-to
+

Rename the original symbol's name to SYMBOL.

S

scope async

The callback is valid until first called.

scope call

The callback is valid only during the call to the method.

+
skip
+

Exposed in C code, not necessarily available in other languages.

T

transfer container

Free data container after the code is done.

@@ -66,7 +73,6 @@

Override the parsed C type with given type.

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/ch01.html libsoup2.4-2.54.1/docs/reference/html/ch01.html --- libsoup2.4-2.52.2/docs/reference/html/ch01.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/ch01.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Tutorial +Tutorial: libsoup Reference Manual - + @@ -43,7 +43,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/ch02.html libsoup2.4-2.54.1/docs/reference/html/ch02.html --- libsoup2.4-2.52.2/docs/reference/html/ch02.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/ch02.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Core API +Core API: libsoup Reference Manual - + @@ -106,7 +106,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/ch03.html libsoup2.4-2.54.1/docs/reference/html/ch03.html --- libsoup2.4-2.52.2/docs/reference/html/ch03.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/ch03.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Additional Features +Additional Features: libsoup Reference Manual - + @@ -53,7 +53,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/ch04.html libsoup2.4-2.54.1/docs/reference/html/ch04.html --- libsoup2.4-2.52.2/docs/reference/html/ch04.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/ch04.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Web Services APIs +Web Services APIs: libsoup Reference Manual - + @@ -35,7 +35,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/ch05.html libsoup2.4-2.54.1/docs/reference/html/ch05.html --- libsoup2.4-2.52.2/docs/reference/html/ch05.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/ch05.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Low-level Networking API +Low-level Networking API: libsoup Reference Manual - + @@ -32,7 +32,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/index.html libsoup2.4-2.54.1/docs/reference/html/index.html --- libsoup2.4-2.52.2/docs/reference/html/index.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/index.html 2016-04-26 12:36:43.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -175,7 +175,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/index.sgml libsoup2.4-2.54.1/docs/reference/html/index.sgml --- libsoup2.4-2.52.2/docs/reference/html/index.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/index.sgml 2016-04-26 12:36:43.000000000 +0000 @@ -23,12 +23,15 @@ + + + @@ -143,6 +146,8 @@ + + @@ -219,7 +224,6 @@ - @@ -227,8 +231,23 @@ + + + + + + + + + + + + + + + @@ -296,7 +315,6 @@ - @@ -323,9 +341,20 @@ + + + + + + + + + + + @@ -361,6 +390,10 @@ + + + + @@ -431,6 +464,13 @@ + + + + + + + @@ -564,6 +604,9 @@ + + + @@ -633,7 +676,6 @@ - @@ -652,6 +694,10 @@ + + + + @@ -707,25 +753,19 @@ - - - - - - @@ -744,6 +784,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -756,6 +859,10 @@ + + + + @@ -911,6 +1018,9 @@ + + + @@ -957,8 +1067,6 @@ - - @@ -967,6 +1075,10 @@ + + + + @@ -1020,8 +1132,20 @@ + + + + + + + + + + + + @@ -1053,10 +1177,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -1098,6 +1246,9 @@ + + + @@ -1141,6 +1292,10 @@ + + + + @@ -1185,8 +1340,10 @@ + + diff -Nru libsoup2.4-2.52.2/docs/reference/html/ix01.html libsoup2.4-2.54.1/docs/reference/html/ix01.html --- libsoup2.4-2.52.2/docs/reference/html/ix01.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/ix01.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Index +Index: libsoup Reference Manual - + @@ -515,6 +515,8 @@
soup_auth_authenticate, soup_auth_authenticate ()
+
soup_auth_can_authenticate, soup_auth_can_authenticate () +
soup_auth_domain_accepts, soup_auth_domain_accepts ()
soup_auth_domain_add_path, soup_auth_domain_add_path () @@ -595,6 +597,8 @@
soup_auth_manager_use_auth, soup_auth_manager_use_auth ()
+
soup_auth_negotiate_supported, soup_auth_negotiate_supported () +
soup_auth_new, soup_auth_new ()
SOUP_AUTH_REALM, SOUP_AUTH_REALM @@ -857,10 +861,6 @@
SOUP_HTTP_ERROR, SOUP_HTTP_ERROR
-
soup_logger_attach, soup_logger_attach () -
-
soup_logger_detach, soup_logger_detach () -
soup_logger_new, soup_logger_new ()
soup_logger_set_printer, soup_logger_set_printer () @@ -935,8 +935,6 @@
soup_message_headers_free_ranges, soup_message_headers_free_ranges ()
-
soup_message_headers_get, soup_message_headers_get () -
soup_message_headers_get_content_disposition, soup_message_headers_get_content_disposition ()
soup_message_headers_get_content_length, soup_message_headers_get_content_length () @@ -1015,8 +1013,6 @@
SOUP_MESSAGE_SERVER_SIDE, SOUP_MESSAGE_SERVER_SIDE
-
soup_message_set_chunk_allocator, soup_message_set_chunk_allocator () -
soup_message_set_first_party, soup_message_set_first_party ()
soup_message_set_flags, soup_message_set_flags () @@ -1219,10 +1215,6 @@
SOUP_SESSION_ASYNC_CONTEXT, SOUP_SESSION_ASYNC_CONTEXT
-
soup_session_async_new, soup_session_async_new () -
-
soup_session_async_new_with_options, soup_session_async_new_with_options () -
soup_session_cancel_message, soup_session_cancel_message ()
soup_session_get_async_context, soup_session_get_async_context () @@ -1255,8 +1247,6 @@
soup_session_prefetch_dns, soup_session_prefetch_dns ()
-
soup_session_prepare_for_uri, soup_session_prepare_for_uri (), soup_session_prepare_for_uri () -
SOUP_SESSION_PROXY_RESOLVER, SOUP_SESSION_PROXY_RESOLVER
SOUP_SESSION_PROXY_URI, SOUP_SESSION_PROXY_URI @@ -1297,10 +1287,6 @@
soup_session_steal_connection, soup_session_steal_connection ()
-
soup_session_sync_new, soup_session_sync_new () -
-
soup_session_sync_new_with_options, soup_session_sync_new_with_options () -
SOUP_SESSION_TIMEOUT, SOUP_SESSION_TIMEOUT
SOUP_SESSION_TLS_DATABASE, SOUP_SESSION_TLS_DATABASE @@ -1407,6 +1393,8 @@
SOUP_TYPE_AUTH_MANAGER, SOUP_TYPE_AUTH_MANAGER
+
SOUP_TYPE_AUTH_NEGOTIATE, SOUP_TYPE_AUTH_NEGOTIATE +
SOUP_TYPE_AUTH_NTLM, SOUP_TYPE_AUTH_NTLM
soup_uri_copy, soup_uri_copy () @@ -1591,7 +1579,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4.devhelp2 libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4.devhelp2 --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4.devhelp2 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4.devhelp2 2016-04-26 12:36:43.000000000 +0000 @@ -1,5 +1,4 @@ - @@ -61,43 +60,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -225,7 +201,6 @@ - @@ -291,7 +266,6 @@ - @@ -514,7 +488,6 @@ - @@ -584,11 +557,7 @@ - - - - @@ -710,8 +679,6 @@ - - @@ -868,5 +835,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-HTML-Form-Support.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-HTML-Form-Support.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-HTML-Form-Support.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-HTML-Form-Support.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: HTML Form Support +HTML Form Support: libsoup Reference Manual - + @@ -182,7 +182,7 @@ table containing the name/value pairs from encoded_form , which you can free with g_hash_table_destroy().

-

[element-type utf8 utf8][transfer full]

+

[element-type utf8 utf8][transfer container]

@@ -263,9 +263,9 @@ ) from msg , which you can free with g_hash_table_destroy(). On error, it will return NULL.

-

[nullable][element-type utf8 utf8][transfer full]

+

[nullable][element-type utf8 utf8][transfer container]

-

Since 2.26

+

Since: 2.26

@@ -307,7 +307,6 @@

Returns

the encoded form

-

@@ -338,7 +337,6 @@

Returns

the encoded form

-

@@ -373,7 +371,6 @@

Returns

the encoded form

-

@@ -410,7 +407,6 @@

Returns

the encoded form

-

@@ -608,7 +604,7 @@

the new SoupMessage.

[transfer full]

-

Since 2.26

+

Since: 2.26

@@ -620,7 +616,7 @@

A macro containing the value "multipart/form-data"; the MIME type used for posting form data that contains files to be uploaded.

-

Since 2.26

+

Since: 2.26

@@ -630,7 +626,7 @@

A macro containing the value "application/x-www-form-urlencoded"; the default MIME type for POSTing HTML form data.

-

Since 2.26

+

Since: 2.26

@@ -639,7 +635,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-soup-method.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-soup-method.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-soup-method.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-soup-method.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: soup-method +soup-method: libsoup Reference Manual - + @@ -138,6 +138,7 @@

Functions

+

Types and Values

@@ -248,7 +249,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-Soup-Miscellaneous-Utilities.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Soup Miscellaneous Utilities +Soup Miscellaneous Utilities: libsoup Reference Manual - + @@ -422,7 +422,6 @@

Returns

a new SoupDate

-

@@ -483,7 +482,6 @@

Returns

a new SoupDate

-

@@ -517,7 +515,6 @@

Returns

a new SoupDate

-

@@ -555,7 +552,6 @@

Returns

date as a string

-

@@ -588,7 +584,6 @@

Returns

date as a time_t

-

@@ -621,7 +616,7 @@ -

Since 2.24

+

Since: 2.24

@@ -649,9 +644,8 @@

Returns

TRUE if date is in the past

-

-

Since 2.24

+

Since: 2.24

@@ -679,9 +673,8 @@

Returns

date 's day

-

-

Since 2.32

+

Since: 2.32

@@ -709,9 +702,8 @@

Returns

date 's hour

-

-

Since 2.32

+

Since: 2.32

@@ -739,9 +731,8 @@

Returns

date 's minute

-

-

Since 2.32

+

Since: 2.32

@@ -769,9 +760,8 @@

Returns

date 's month

-

-

Since 2.32

+

Since: 2.32

@@ -801,9 +791,8 @@ 's offset from UTC. If soup_date_get_utc() returns FALSE but soup_date_get_offset() returns 0, that means the date is a "floating" time with no associated offset information.

-

-

Since 2.32

+

Since: 2.32

@@ -831,9 +820,8 @@

Returns

date 's second

-

-

Since 2.32

+

Since: 2.32

@@ -861,9 +849,8 @@

Returns

TRUE if date is UTC.

-

-

Since 2.32

+

Since: 2.32

@@ -891,9 +878,8 @@

Returns

date 's year

-

-

Since 2.32

+

Since: 2.32

@@ -917,7 +903,7 @@
-

Since 2.24

+

Since: 2.24

@@ -988,7 +974,6 @@

Returns

SOUP_STATUS_OK if the headers could be parsed, or an HTTP error to be returned to the client if they could not be.

-

@@ -1059,7 +1044,6 @@

Returns

success or failure.

-

@@ -1117,7 +1101,6 @@

Returns

TRUE if status_line was parsed successfully.

-

@@ -1167,9 +1150,8 @@

Returns

success or failure

-

-

Since 2.26

+

Since: 2.26

@@ -1251,8 +1233,9 @@ soup_header_free_list (GSList *list);

Frees list .

+

[skip]

-

Parameters

+

Parameters

@@ -1307,7 +1290,6 @@

whether or not header contains token

-

@@ -1379,7 +1361,7 @@ soup_header_free_param_list().

[element-type utf8 utf8][transfer full]

-

Since 2.24

+

Since: 2.24

@@ -1457,7 +1439,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1503,7 +1485,7 @@
-

Since 2.30

+

Since: 2.30

@@ -1539,7 +1521,6 @@

Returns

TRUE if they are equal (modulo case)

-

@@ -1567,7 +1548,6 @@

Returns

the hash code.

-

@@ -1583,8 +1563,9 @@ default priority. Use this when you want to complete an action in async_context 's main loop, as soon as possible.

+

[skip]

-

Parameters

+

Parameters

@@ -1613,12 +1594,11 @@
-

Returns

+

Returns

a GSource, which can be removed from async_context with g_source_destroy().

-

-

Since 2.24

+

Since: 2.24

@@ -1634,8 +1614,9 @@ to run "right away", use soup_add_completion(), since that sets a higher priority on the GSource than soup_add_idle() does.

+

[skip]

-

Parameters

+

Parameters

@@ -1664,10 +1645,9 @@
-

Returns

+

Returns

a GSource, which can be removed from async_context with g_source_destroy().

-

@@ -1682,8 +1662,9 @@

Adds an I/O watch as with g_io_add_watch(), but using the given async_context .

+

[skip]

-

Parameters

+

Parameters

@@ -1723,10 +1704,9 @@
-

Returns

+

Returns

a GSource, which can be removed from async_context with g_source_destroy().

-

@@ -1740,8 +1720,9 @@

Adds a timeout as with g_timeout_add(), but using the given async_context .

+

[skip]

-

Parameters

+

Parameters

@@ -1775,10 +1756,9 @@
-

Returns

+

Returns

a GSource, which can be removed from async_context with g_source_destroy().

-

@@ -1949,7 +1929,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-SoupServer-deprecated-API.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-SoupServer-deprecated-API.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-SoupServer-deprecated-API.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-SoupServer-deprecated-API.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupServer deprecated API +SoupServer deprecated API: libsoup Reference Manual - + @@ -144,8 +144,6 @@

Description

-

-

Functions

@@ -180,7 +178,6 @@

Returns

the port server is listening on.

-

@@ -513,7 +510,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-soup-status.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-soup-status.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-soup-status.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-soup-status.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: soup-status +soup-status: libsoup Reference Manual - + @@ -146,7 +146,6 @@

Returns

TRUE or FALSE

-

@@ -174,7 +173,6 @@

Returns

TRUE or FALSE

-

@@ -202,7 +200,6 @@

Returns

TRUE or FALSE

-

@@ -230,7 +227,6 @@

Returns

TRUE or FALSE

-

@@ -258,7 +254,6 @@

Returns

TRUE or FALSE

-

@@ -286,7 +281,6 @@

Returns

TRUE or FALSE

-

@@ -326,7 +320,6 @@

Returns

the (terse, English) description of status_code

-

@@ -357,9 +350,8 @@

Returns

the "proxified" equivalent of status_code .

-

-

Since 2.26

+

Since: 2.26

@@ -854,7 +846,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-Top-Level-Domain-utils.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-Top-Level-Domain-utils.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-Top-Level-Domain-utils.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-Top-Level-Domain-utils.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Top Level Domain utils +Top Level Domain utils: libsoup Reference Manual - + @@ -136,9 +136,8 @@ . If an error occurs, NULL will be returned and error set.

-

-

Since 2.40

+

Since: 2.40

@@ -171,9 +170,8 @@

Returns

TRUE if it is a public domain, FALSE otherwise.

-

-

Since 2.40

+

Since: 2.40

@@ -183,7 +181,7 @@ 
#define SOUP_TLD_ERROR soup_tld_error_quark()

The GError domain for soup-tld-related errors.

-

Since 2.40

+

Since: 2.40

@@ -235,12 +233,11 @@
-

Since 2.40

+

Since: 2.40

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-Version-Information.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-Version-Information.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-Version-Information.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-Version-Information.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Version Information +Version Information: libsoup Reference Manual - + @@ -183,9 +183,8 @@

Returns

the major version number of the libsoup library

-

-

Since 2.42

+

Since: 2.42

@@ -201,9 +200,8 @@

Returns

the minor version number of the libsoup library

-

-

Since 2.42

+

Since: 2.42

@@ -219,9 +217,8 @@

Returns

the micro version number of the libsoup library

-

-

Since 2.42

+

Since: 2.42

@@ -265,9 +262,8 @@

Returns

TRUE if the version of the libsoup currently loaded is the same as or newer than the passed-in version.

-

-

Since 2.42

+

Since: 2.42

@@ -277,27 +273,27 @@

Like soup_get_major_version(), but from the headers used at application compile time, rather than from the library linked against at application run time.

-

Since 2.42

+

Since: 2.42

SOUP_MINOR_VERSION

-
#define SOUP_MINOR_VERSION (52)
+
#define SOUP_MINOR_VERSION (54)
 

 
Like soup_get_minor_version(), but from the headers used at
 application compile time, rather than from the library linked
 against at application run time.

-
Since 2.42

+
Since: 2.42

SOUP_MICRO_VERSION

-
#define SOUP_MICRO_VERSION (2)
+
#define SOUP_MICRO_VERSION (1)
 

 
Like soup_get_micro_version(), but from the headers used at
 application compile time, rather than from the library linked
 against at application run time.

-
Since 2.42

+
Since: 2.42
@@ -335,9 +331,8 @@

Returns

TRUE if the version of the libsoup header files is the same as or newer than the passed-in version.

-

-

Since 2.42

+

Since: 2.42

@@ -353,7 +348,7 @@ functions, then using functions that were deprecated in version SOUP_VERSION_MIN_REQUIRED or earlier will cause warnings (but using functions deprecated in later releases will not).

-

Since 2.42

+

Since: 2.42

@@ -371,157 +366,157 @@

Unless you are using SOUP_CHECK_VERSION() or the like to compile different code depending on the libsoup version, then this should be set to the same value as SOUP_VERSION_MIN_REQUIRED.

-

Since 2.42

+

Since: 2.42

SOUP_VERSION_2_24

-
#define SOUP_VERSION_2_24 (SOUP_ENCODE_VERSION (2, 24))
+
#define SOUP_VERSION_2_24 (G_ENCODE_VERSION (2, 24))
 

 
A macro that evaluates to the 2.24 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_26

-
#define SOUP_VERSION_2_26 (SOUP_ENCODE_VERSION (2, 26))
+
#define SOUP_VERSION_2_26 (G_ENCODE_VERSION (2, 26))
 

 
A macro that evaluates to the 2.26 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_28

-
#define SOUP_VERSION_2_28 (SOUP_ENCODE_VERSION (2, 28))
+
#define SOUP_VERSION_2_28 (G_ENCODE_VERSION (2, 28))
 

 
A macro that evaluates to the 2.28 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_30

-
#define SOUP_VERSION_2_30 (SOUP_ENCODE_VERSION (2, 30))
+
#define SOUP_VERSION_2_30 (G_ENCODE_VERSION (2, 30))
 

 
A macro that evaluates to the 2.30 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_32

-
#define SOUP_VERSION_2_32 (SOUP_ENCODE_VERSION (2, 32))
+
#define SOUP_VERSION_2_32 (G_ENCODE_VERSION (2, 32))
 

 
A macro that evaluates to the 2.32 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_34

-
#define SOUP_VERSION_2_34 (SOUP_ENCODE_VERSION (2, 34))
+
#define SOUP_VERSION_2_34 (G_ENCODE_VERSION (2, 34))
 

 
A macro that evaluates to the 2.34 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_36

-
#define SOUP_VERSION_2_36 (SOUP_ENCODE_VERSION (2, 36))
+
#define SOUP_VERSION_2_36 (G_ENCODE_VERSION (2, 36))
 

 
A macro that evaluates to the 2.36 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_38

-
#define SOUP_VERSION_2_38 (SOUP_ENCODE_VERSION (2, 38))
+
#define SOUP_VERSION_2_38 (G_ENCODE_VERSION (2, 38))
 

 
A macro that evaluates to the 2.38 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_40

-
#define SOUP_VERSION_2_40 (SOUP_ENCODE_VERSION (2, 40))
+
#define SOUP_VERSION_2_40 (G_ENCODE_VERSION (2, 40))
 

 
A macro that evaluates to the 2.40 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_42

-
#define SOUP_VERSION_2_42 (SOUP_ENCODE_VERSION (2, 42))
+
#define SOUP_VERSION_2_42 (G_ENCODE_VERSION (2, 42))
 

 
A macro that evaluates to the 2.42 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.42

+
Since: 2.42

SOUP_VERSION_2_44

-
#define SOUP_VERSION_2_44 (SOUP_ENCODE_VERSION (2, 44))
+
#define SOUP_VERSION_2_44 (G_ENCODE_VERSION (2, 44))
 

 
A macro that evaluates to the 2.44 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.44

+
Since: 2.44

SOUP_VERSION_2_46

-
#define SOUP_VERSION_2_46 (SOUP_ENCODE_VERSION (2, 46))
+
#define SOUP_VERSION_2_46 (G_ENCODE_VERSION (2, 46))
 

 
A macro that evaluates to the 2.46 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.46

+
Since: 2.46

SOUP_VERSION_2_48

-
#define SOUP_VERSION_2_48 (SOUP_ENCODE_VERSION (2, 48))
+
#define SOUP_VERSION_2_48 (G_ENCODE_VERSION (2, 48))
 

 
A macro that evaluates to the 2.48 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.48

+
Since: 2.48

SOUP_VERSION_2_50

-
#define SOUP_VERSION_2_50 (SOUP_ENCODE_VERSION (2, 50))
+
#define SOUP_VERSION_2_50 (G_ENCODE_VERSION (2, 50))
 

 
A macro that evaluates to the 2.50 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.50

+
Since: 2.50

SOUP_VERSION_2_52

-
#define SOUP_VERSION_2_52 (SOUP_ENCODE_VERSION (2, 52))
+
#define SOUP_VERSION_2_52 (G_ENCODE_VERSION (2, 52))
 

 
A macro that evaluates to the 2.52 version of libsoup, in a format
 that can be used by SOUP_VERSION_MIN_REQUIRED and
 SOUP_VERSION_MAX_ALLOWED.

-
Since 2.52

+
Since: 2.52
@@ -529,7 +524,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-WebSockets.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-WebSockets.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-WebSockets.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-WebSockets.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: WebSockets +WebSockets: libsoup Reference Manual - + @@ -362,7 +362,7 @@ -

Since 2.50

+

Since: 2.50

@@ -407,9 +407,8 @@

TRUE if msg contains a completed valid WebSocket handshake, FALSE and an error if not.

-

-

Since 2.50

+

Since: 2.50

@@ -473,9 +472,8 @@

TRUE if msg contained a valid WebSocket handshake, FALSE and an error if not.

-

-

Since 2.50

+

Since: 2.50

@@ -532,9 +530,8 @@

TRUE if msg contained a valid WebSocket handshake request and was updated to contain a handshake response. FALSE if not.

-

-

Since 2.50

+

Since: 2.50

@@ -589,9 +586,8 @@

Returns

a new SoupWebsocketConnection

-

-

Since 2.50

+

Since: 2.50

@@ -620,7 +616,7 @@

the WebSocket's I/O stream.

[transfer none]

-

Since 2.50

+

Since: 2.50

@@ -647,9 +643,8 @@

Returns

the connection type

-

-

Since 2.50

+

Since: 2.50

@@ -679,7 +674,7 @@

the URI.

[transfer none]

-

Since 2.50

+

Since: 2.50

@@ -707,7 +702,7 @@

the origin, or NULL.

[nullable]

-

Since 2.50

+

Since: 2.50

@@ -736,7 +731,7 @@

the chosen protocol, or NULL.

[nullable]

-

Since 2.50

+

Since: 2.50

@@ -762,9 +757,8 @@

Returns

the state

-

-

Since 2.50

+

Since: 2.50

@@ -797,7 +791,7 @@
-

Since 2.50

+

Since: 2.50

@@ -837,7 +831,7 @@
-

Since 2.50

+

Since: 2.50

@@ -882,7 +876,7 @@
-

Since 2.50

+

Since: 2.50

@@ -913,9 +907,8 @@

Returns

the close code or zero.

-

-

Since 2.50

+

Since: 2.50

@@ -945,9 +938,8 @@

Returns

the close data or NULL

-

-

Since 2.50

+

Since: 2.50

@@ -956,7 +948,7 @@

A GError domain for WebSocket-related errors. Used with SoupWebsocketError.

-

Since 2.50

+

Since: 2.50

@@ -965,7 +957,7 @@

SoupWebsocketConnection

typedef struct _SoupWebsocketConnection SoupWebsocketConnection;

A class representing a WebSocket connection.

-

Since 2.50

+

Since: 2.50

@@ -1004,7 +996,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1044,7 +1036,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1077,7 +1069,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1192,7 +1184,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1241,7 +1233,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1252,7 +1244,7 @@

The type of connection (client/server).

Flags: Read / Write / Construct Only

Default value: SOUP_WEBSOCKET_CONNECTION_UNKNOWN

-

Since 2.50

+

Since: 2.50

@@ -1262,7 +1254,7 @@ over.

The input and output streams must be pollable streams.

Flags: Read / Write / Construct Only

-

Since 2.50

+

Since: 2.50

@@ -1271,7 +1263,7 @@

The client's Origin.

Flags: Read / Write / Construct Only

Default value: NULL

-

Since 2.50

+

Since: 2.50

@@ -1281,7 +1273,7 @@ upon.

Flags: Read / Write / Construct Only

Default value: NULL

-

Since 2.50

+

Since: 2.50

@@ -1290,7 +1282,7 @@

The current state of the WebSocket.

Flags: Read

Default value: SOUP_WEBSOCKET_STATE_OPEN

-

Since 2.50

+

Since: 2.50

@@ -1300,7 +1292,7 @@

For servers this represents the address of the WebSocket, and for clients it is the address connected to.

Flags: Read / Write / Construct Only

-

Since 2.50

+

Since: 2.50

@@ -1338,7 +1330,7 @@

Flags: Run First

-

Since 2.50

+

Since: 2.50

@@ -1370,7 +1362,7 @@

Flags: Run Last

-

Since 2.50

+

Since: 2.50

@@ -1410,7 +1402,7 @@

Flags: Run First

-

Since 2.50

+

Since: 2.50

@@ -1458,7 +1450,7 @@

Flags: Run First

-

Since 2.50

+

Since: 2.50

@@ -1468,7 +1460,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-XMLRPC-Support.html libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-XMLRPC-Support.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-2.4-XMLRPC-Support.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-2.4-XMLRPC-Support.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: XMLRPC Support +XMLRPC Support: libsoup Reference Manual - + @@ -240,9 +240,8 @@

Returns

the text of the methodCall, or NULL on error.

-

-

Since 2.52

+

Since: 2.52

@@ -296,7 +295,7 @@ indicated XML-RPC request, or NULL on error.

[transfer full]

-

Since 2.52

+

Since: 2.52

@@ -356,7 +355,7 @@

a new (non-floating) GVariant, or NULL.

[transfer full]

-

Since 2.52

+

Since: 2.52

@@ -396,9 +395,8 @@

Returns

a floating GVariant.

-

-

Since 2.52

+

Since: 2.52

@@ -438,9 +436,8 @@

Returns

a new SoupDate, or NULL on error.

-

-

Since 2.52

+

Since: 2.52

@@ -463,7 +460,7 @@
-

Since 2.52

+

Since: 2.52

@@ -530,7 +527,7 @@

a new (non-floating) GVariant, or NULL.

[transfer full]

-

Since 2.52

+

Since: 2.52

@@ -581,7 +578,7 @@

method's name, or NULL on error.

[transfer full]

-

Since 2.52

+

Since: 2.52

@@ -623,9 +620,8 @@

Returns

the text of the methodResponse, or NULL on error.

-

-

Since 2.52

+

Since: 2.52

@@ -668,7 +664,6 @@

Returns

the text of the fault

-

@@ -716,9 +711,8 @@

Returns

TRUE on success, FALSE otherwise.

-

-

Since 2.52

+

Since: 2.52

@@ -767,7 +761,7 @@
-

Since 2.52

+

Since: 2.52

@@ -776,16 +770,12 @@

SOUP_XMLRPC_ERROR

#define SOUP_XMLRPC_ERROR soup_xmlrpc_error_quark()
-

-

enum SoupXMLRPCError

-

-

-

Members

+

Members

@@ -795,13 +785,13 @@ - - + + - - + +

SOUP_XMLRPC_ERROR_ARGUMENTS

    

SOUP_XMLRPC_ERROR_RETVAL

    
@@ -921,12 +911,11 @@

Opaque structure containing XML-RPC methodCall parameter values. Can be parsed using soup_xmlrpc_params_parse() and freed with soup_xmlrpc_params_free().

-

Since 2.52

+

Since: 2.52

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-build-howto.html libsoup2.4-2.54.1/docs/reference/html/libsoup-build-howto.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-build-howto.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-build-howto.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Compiling with libsoup +Compiling with libsoup: libsoup Reference Manual - + @@ -130,7 +130,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-client-howto.html libsoup2.4-2.54.1/docs/reference/html/libsoup-client-howto.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-client-howto.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-client-howto.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: libsoup Client Basics +libsoup Client Basics: libsoup Reference Manual - + @@ -280,7 +280,7 @@ msg = soup_message_new ("POST", "http://example.com/form.cgi"); soup_message_set_request (msg, "application/x-www-form-urlencoded", - SOUP_MEMORY_COPY, formdata, strlen (formdata)); + SOUP_MEMORY_COPY, formdata, strlen (formdata)); soup_message_headers_append (msg->request_headers, "Referer", referring_url); @@ -476,7 +476,7 @@ reason_phrase fields contain the numeric status and textual status response from the server. response_headers contains the response -headers, which you can investigate using soup_message_headers_get +headers, which you can investigate using soup_message_headers_get and soup_message_headers_foreach.

@@ -598,7 +598,6 @@

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-request-howto.html libsoup2.4-2.54.1/docs/reference/html/libsoup-request-howto.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-request-howto.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-request-howto.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: libsoup Client SoupRequest API +libsoup Client SoupRequest API: libsoup Reference Manual - + @@ -166,7 +166,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-server-howto.html libsoup2.4-2.54.1/docs/reference/html/libsoup-server-howto.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-server-howto.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-server-howto.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: libsoup Server Basics +libsoup Server Basics: libsoup Reference Manual - + @@ -299,7 +299,7 @@ GByteArray *body; if (msg->method != SOUP_METHOD_GET) { - soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED); + soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED); return; } @@ -309,12 +309,12 @@ body = g_hash_table_lookup (server_data->bodies, path); mime_type = g_hash_table_lookup (server_data->mime_types, path); if (!body || !mime_type) { - soup_message_set_status (msg, SOUP_STATUS_NOT_FOUND); + soup_message_set_status (msg, SOUP_STATUS_NOT_FOUND); return; } - soup_message_set_status (msg, SOUP_STATUS_OK); - soup_message_set_response (msg, mime_type, SOUP_MEMORY_COPY, + soup_message_set_status (msg, SOUP_STATUS_OK); + soup_message_set_response (msg, mime_type, SOUP_MEMORY_COPY, body->data, body->len); } @@ -479,7 +479,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/libsoup-session-porting.html libsoup2.4-2.54.1/docs/reference/html/libsoup-session-porting.html --- libsoup2.4-2.52.2/docs/reference/html/libsoup-session-porting.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/libsoup-session-porting.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: Porting to the new SoupSession +Porting to the new SoupSession: libsoup Reference Manual - + @@ -212,7 +212,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupAddress.html libsoup2.4-2.54.1/docs/reference/html/SoupAddress.html --- libsoup2.4-2.52.2/docs/reference/html/SoupAddress.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupAddress.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupAddress +SoupAddress: libsoup Reference Manual - + @@ -326,7 +326,6 @@

Returns

a SoupAddress

-

@@ -554,7 +553,6 @@

Returns

SOUP_STATUS_OK, SOUP_STATUS_CANT_RESOLVE, or SOUP_STATUS_CANCELLED.

-

@@ -586,7 +584,6 @@

Returns

TRUE if addr has been resolved.

-

@@ -693,7 +690,7 @@

a new GSocketAddress.

[transfer full]

-

Since 2.32

+

Since: 2.32

@@ -754,7 +751,6 @@

Returns

the port

-

@@ -812,9 +808,8 @@

whether or not addr1 and addr2 have the same name

-

-

Since 2.26

+

Since: 2.26

@@ -842,9 +837,8 @@

Returns

the named-based hash value for addr .

-

-

Since 2.26

+

Since: 2.26

@@ -894,9 +888,8 @@ and addr2 have the same IP address.

-

-

Since 2.26

+

Since: 2.26

@@ -924,9 +917,8 @@

Returns

the IP-based hash value for addr .

-

-

Since 2.26

+

Since: 2.26

@@ -934,8 +926,6 @@

SoupAddress

typedef struct _SoupAddress SoupAddress;
-

-

@@ -1084,7 +1074,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupAuthDomainBasic.html libsoup2.4-2.54.1/docs/reference/html/SoupAuthDomainBasic.html --- libsoup2.4-2.52.2/docs/reference/html/SoupAuthDomainBasic.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupAuthDomainBasic.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupAuthDomainBasic +SoupAuthDomainBasic: libsoup Reference Manual - + @@ -166,7 +166,6 @@

Returns

the new SoupAuthDomain

-

@@ -235,7 +234,6 @@

TRUE if username and password are valid

-

@@ -300,8 +298,6 @@

SoupAuthDomainBasic

typedef struct _SoupAuthDomainBasic SoupAuthDomainBasic;
-

-

@@ -338,7 +334,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupAuthDomainDigest.html libsoup2.4-2.54.1/docs/reference/html/SoupAuthDomainDigest.html --- libsoup2.4-2.52.2/docs/reference/html/SoupAuthDomainDigest.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupAuthDomainDigest.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupAuthDomainDigest +SoupAuthDomainDigest: libsoup Reference Manual - + @@ -174,7 +174,6 @@

Returns

the new SoupAuthDomain

-

@@ -343,7 +342,6 @@

Returns

the encoded password

-

@@ -352,8 +350,6 @@

SoupAuthDomainDigest

typedef struct _SoupAuthDomainDigest SoupAuthDomainDigest;
-

-

@@ -390,7 +386,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupAuthDomain.html libsoup2.4-2.54.1/docs/reference/html/SoupAuthDomain.html --- libsoup2.4-2.52.2/docs/reference/html/SoupAuthDomain.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupAuthDomain.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupAuthDomain +SoupAuthDomain: libsoup Reference Manual - + @@ -391,7 +391,6 @@

Returns

TRUE if msg requires authentication, FALSE if not.

-

@@ -488,7 +487,6 @@

Returns

domain 's realm

-

@@ -551,7 +549,6 @@

Returns

TRUE if msg is authenticated, FALSE if not.

-

@@ -658,7 +655,6 @@

Returns

whether or not the message is authenticated

-

@@ -703,7 +699,6 @@

TRUE if domain requires msg to be authenticated

-

@@ -794,8 +789,6 @@

SoupAuthDomain

typedef struct _SoupAuthDomain SoupAuthDomain;
-

-

@@ -930,7 +923,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupAuth.html libsoup2.4-2.54.1/docs/reference/html/SoupAuth.html --- libsoup2.4-2.52.2/docs/reference/html/SoupAuth.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupAuth.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupAuth +SoupAuth: libsoup Reference Manual - + @@ -70,6 +70,18 @@ SOUP_TYPE_AUTH_NTLM +#define +SOUP_TYPE_AUTH_NEGOTIATE + + + +gboolean + + +soup_auth_negotiate_supported () + + + gboolean @@ -119,6 +131,14 @@ gboolean +soup_auth_can_authenticate () + + + + +gboolean + + soup_auth_is_authenticated () @@ -346,7 +366,6 @@ unauthenticated) SoupAuth. FALSE if something about auth_params could not be parsed or incorporated into auth at all.

-

@@ -358,7 +377,7 @@ SoupSessions support this by default; if you want to disable support for it, call soup_session_remove_feature_by_type(), passing SOUP_TYPE_AUTH_BASIC.

-

Since 2.34

+

Since: 2.34

@@ -369,7 +388,7 @@ SoupSessions support this by default; if you want to disable support for it, call soup_session_remove_feature_by_type(), passing SOUP_TYPE_AUTH_DIGEST.

-

Since 2.34

+

Since: 2.34

@@ -380,7 +399,32 @@ SoupSessions do not support this type by default; if you want to enable support for it, call soup_session_add_feature_by_type(), passing SOUP_TYPE_AUTH_NTLM.

-

Since 2.34

+

Since: 2.34

+
+
+
+

SOUP_TYPE_AUTH_NEGOTIATE

+
#define SOUP_TYPE_AUTH_NEGOTIATE  (soup_auth_negotiate_get_type ())
+
+

A GType corresponding to HTTP-based GSS-Negotiate authentication. +SoupSessions do not support this type by default; if you want to +enable support for it, call soup_session_add_feature_by_type(), +passing SOUP_TYPE_AUTH_NEGOTIATE.

+

This auth type will only work if libsoup was compiled with GSSAPI +support; you can check soup_auth_negotiate_supported() to see if it +was.

+

Since: 2.54

+
+
+
+

soup_auth_negotiate_supported ()

+
gboolean
+soup_auth_negotiate_supported (void);
+

Indicates whether libsoup was built with GSSAPI support. If this is +FALSE, SOUP_TYPE_AUTH_NEGOTIATE will still be defined and can +still be added to a SoupSession, but libsoup will never attempt to +actually use this auth type.

+

Since: 2.54

@@ -391,7 +435,7 @@ is associated with a proxy server rather than an "origin" server.

-

Parameters

+

Parameters

@@ -406,9 +450,8 @@
-

Returns

+

Returns

TRUE or FALSE

-

@@ -419,7 +462,7 @@

Returns auth 's scheme name. (Eg, "Basic", "Digest", or "NTLM")

-

Parameters

+

Parameters

@@ -434,9 +477,8 @@
-

Returns

+

Returns

the scheme name

-

@@ -447,7 +489,7 @@

Returns the host that auth is associated with.

-

Parameters

+

Parameters

@@ -462,9 +504,8 @@
-

Returns

+

Returns

the hostname

-

@@ -478,7 +519,7 @@ string that is meaningful to the user. (Although it is probably not localized.)

-

Parameters

+

Parameters

@@ -493,9 +534,8 @@
-

Returns

+

Returns

the realm name

-

@@ -509,7 +549,7 @@ identifier refer to the same authentication domain (eg, the URLs associated with them take the same usernames and passwords).

-

Parameters

+

Parameters

@@ -524,9 +564,8 @@
-

Returns

+

Returns

the identifier

-

@@ -539,7 +578,7 @@

Call this on an auth to authenticate it; normally this will cause the auth's message to be requeued with the new authentication info.

-

Parameters

+

Parameters

@@ -568,13 +607,43 @@
+

soup_auth_can_authenticate ()

+
gboolean
+soup_auth_can_authenticate (SoupAuth *auth);
+

Tests if auth + is able to authenticate by providing credentials to the +soup_auth_authenticate().

+
+

Parameters

+
+++++ + + + + + +

auth

a SoupAuth

 
+
+
+

Returns

+

TRUE if auth +is able to accept credentials.

+
+

Since: 2.54

+ +
+

soup_auth_is_authenticated ()

gboolean
 soup_auth_is_authenticated (SoupAuth *auth);

Tests if auth has been given a username and password

-

Parameters

+

Parameters

@@ -589,10 +658,9 @@
-

Returns

+

Returns

TRUE if auth has been given a username and password

-

@@ -608,7 +676,7 @@ some auth types (eg, NTLM), the auth may be sendable (eg, as an authentication request) even before it is authenticated.

-

Parameters

+

Parameters

@@ -630,12 +698,11 @@
-

Returns

+

Returns

TRUE if auth is ready to make a request with.

-

-

Since 2.42

+

Since: 2.42

@@ -648,7 +715,7 @@ session will only call this if soup_auth_is_authenticated() returned TRUE.)

-

Parameters

+

Parameters

@@ -670,9 +737,8 @@
-

Returns

+

Returns

the "Authorization" header, which must be freed.

-

@@ -688,7 +754,7 @@ 's protection space, unless otherwise discovered not to be.)

-

Parameters

+

Parameters

@@ -712,7 +778,7 @@
-

Returns

+

Returns

the list of paths, which can be freed with soup_auth_free_protection_space().

[element-type utf8][transfer full]

@@ -726,8 +792,9 @@ GSList *space);

Frees space .

+

[skip]

-

Parameters

+

Parameters

@@ -849,7 +916,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupAuthManager.html libsoup2.4-2.54.1/docs/reference/html/SoupAuthManager.html --- libsoup2.4-2.52.2/docs/reference/html/SoupAuthManager.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupAuthManager.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupAuthManager +SoupAuthManager: libsoup Reference Manual - + @@ -125,7 +125,7 @@ 2.42, it has always existed in the background, and you can use g_type_from_name ("SoupAuthManager") to get its GType in earlier releases.)

-

Since 2.42

+

Since: 2.42

@@ -173,7 +173,7 @@
-

Since 2.42

+

Since: 2.42

@@ -181,8 +181,6 @@

SoupAuthManager

typedef struct _SoupAuthManager SoupAuthManager;
-

-

@@ -246,7 +244,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupCache.html libsoup2.4-2.54.1/docs/reference/html/SoupCache.html --- libsoup2.4-2.52.2/docs/reference/html/SoupCache.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupCache.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupCache +SoupCache: libsoup Reference Manual - + @@ -197,9 +197,8 @@

Returns

a new SoupCache

-

-

Since 2.34

+

Since: 2.34

@@ -228,7 +227,7 @@
-

Since 2.34

+

Since: 2.34

@@ -252,7 +251,7 @@
-

Since 2.34

+

Since: 2.34

@@ -279,7 +278,7 @@
-

Since 2.34.

+

Since: 2.34.

@@ -303,7 +302,7 @@
-

Since 2.34

+

Since: 2.34

@@ -329,9 +328,8 @@

Returns

the maximum size of the cache, in bytes.

-

-

Since 2.34

+

Since: 2.34

@@ -362,7 +360,7 @@
-

Since 2.34

+

Since: 2.34

@@ -370,8 +368,6 @@

struct SoupCache

struct SoupCache;
-

-

@@ -404,7 +400,7 @@
-

Since 2.34

+

Since: 2.34

@@ -427,7 +423,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupContentDecoder.html libsoup2.4-2.54.1/docs/reference/html/SoupContentDecoder.html --- libsoup2.4-2.52.2/docs/reference/html/SoupContentDecoder.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupContentDecoder.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupContentDecoder +SoupContentDecoder: libsoup Reference Manual - + @@ -92,19 +92,17 @@

Functions

+

Types and Values

SoupContentDecoder

typedef struct _SoupContentDecoder SoupContentDecoder;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupContentSniffer.html libsoup2.4-2.54.1/docs/reference/html/SoupContentSniffer.html --- libsoup2.4-2.52.2/docs/reference/html/SoupContentSniffer.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupContentSniffer.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupContentSniffer +SoupContentSniffer: libsoup Reference Manual - + @@ -117,9 +117,8 @@

Returns

a new SoupContentSniffer

-

-

Since 2.28

+

Since: 2.28

@@ -173,9 +172,8 @@

the sniffed Content-Type of buffer ; this will never be NULL, but may be "application/octet-stream".

-

-

Since 2.28

+

Since: 2.28

@@ -203,9 +201,8 @@

Returns

the number of bytes to sniff

-

-

Since 2.28

+

Since: 2.28

@@ -213,13 +210,10 @@

SoupContentSniffer

typedef struct _SoupContentSniffer SoupContentSniffer;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupCookie.html libsoup2.4-2.54.1/docs/reference/html/SoupCookie.html --- libsoup2.4-2.52.2/docs/reference/html/SoupCookie.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupCookie.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupCookie +SoupCookie: libsoup Reference Manual - + @@ -385,9 +385,8 @@

Returns

a new SoupCookie.

-

-

Since 2.24

+

Since: 2.24

@@ -438,7 +437,7 @@ .

[nullable]

-

Since 2.24

+

Since: 2.24

@@ -466,9 +465,8 @@

Returns

a copy of cookie

-

-

Since 2.24

+

Since: 2.24

@@ -492,7 +490,7 @@
-

Since 2.24

+

Since: 2.24

@@ -525,7 +523,7 @@
-

Since 2.24

+

Since: 2.24

@@ -553,9 +551,8 @@

Returns

cookie 's name

-

-

Since 2.32

+

Since: 2.32

@@ -588,7 +585,7 @@
-

Since 2.24

+

Since: 2.24

@@ -616,9 +613,8 @@

Returns

cookie 's value

-

-

Since 2.32

+

Since: 2.32

@@ -651,7 +647,7 @@
-

Since 2.24

+

Since: 2.24

@@ -679,9 +675,8 @@

Returns

cookie 's domain

-

-

Since 2.32

+

Since: 2.32

@@ -714,7 +709,7 @@
-

Since 2.24

+

Since: 2.24

@@ -742,9 +737,8 @@

Returns

cookie 's path

-

-

Since 2.32

+

Since: 2.32

@@ -786,7 +780,7 @@
-

Since 2.24

+

Since: 2.24

@@ -795,7 +789,7 @@

A constant corresponding to 1 hour, for use with soup_cookie_new() and soup_cookie_set_max_age().

-

Since 2.24

+

Since: 2.24

@@ -804,7 +798,7 @@

A constant corresponding to 1 day, for use with soup_cookie_new() and soup_cookie_set_max_age().

-

Since 2.24

+

Since: 2.24

@@ -813,7 +807,7 @@

A constant corresponding to 1 week, for use with soup_cookie_new() and soup_cookie_set_max_age().

-

Since 2.24

+

Since: 2.24

@@ -822,7 +816,7 @@

A constant corresponding to 1 year, for use with soup_cookie_new() and soup_cookie_set_max_age().

-

Since 2.24

+

Since: 2.24

@@ -860,7 +854,7 @@
-

Since 2.24

+

Since: 2.24

@@ -892,7 +886,7 @@ and should not be modified or freed.

[transfer none]

-

Since 2.32

+

Since: 2.32

@@ -928,7 +922,7 @@
-

Since 2.24

+

Since: 2.24

@@ -956,9 +950,8 @@

Returns

cookie 's secure attribute

-

-

Since 2.32

+

Since: 2.32

@@ -994,7 +987,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1022,9 +1015,8 @@

Returns

cookie 's HttpOnly attribute

-

-

Since 2.32

+

Since: 2.32

@@ -1068,9 +1060,8 @@ should be sent to uri , FALSE if not

-

-

Since 2.24

+

Since: 2.24

@@ -1112,9 +1103,8 @@

Returns

TRUE if the domains match, FALSE otherwise

-

-

Since 2.30

+

Since: 2.30

@@ -1142,9 +1132,8 @@

Returns

the header

-

-

Since 2.24

+

Since: 2.24

@@ -1172,9 +1161,8 @@

Returns

the header

-

-

Since 2.24

+

Since: 2.24

@@ -1210,7 +1198,7 @@ soup_cookies_free().

[element-type SoupCookie][transfer full]

-

Since 2.24

+

Since: 2.24

@@ -1244,7 +1232,7 @@ soup_cookies_free().

[element-type SoupCookie][transfer full]

-

Since 2.24

+

Since: 2.24

@@ -1282,7 +1270,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1318,7 +1306,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1346,9 +1334,8 @@

Returns

the serialization of cookies

-

-

Since 2.24

+

Since: 2.24

@@ -1357,8 +1344,9 @@ soup_cookies_free (GSList *cookies);

Frees cookies .

+

[skip]

-

Parameters

+

Parameters

@@ -1372,7 +1360,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1463,7 +1451,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1472,7 +1460,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupCookieJarDB.html libsoup2.4-2.54.1/docs/reference/html/SoupCookieJarDB.html --- libsoup2.4-2.52.2/docs/reference/html/SoupCookieJarDB.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupCookieJarDB.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupCookieJarDB +SoupCookieJarDB: libsoup Reference Manual - + @@ -156,9 +156,8 @@

Returns

the new SoupCookieJar

-

-

Since 2.42

+

Since: 2.42

@@ -166,8 +165,6 @@

SoupCookieJarDB

typedef struct _SoupCookieJarDB SoupCookieJarDB;
-

-

@@ -190,7 +187,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupCookieJar.html libsoup2.4-2.54.1/docs/reference/html/SoupCookieJar.html --- libsoup2.4-2.52.2/docs/reference/html/SoupCookieJar.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupCookieJar.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupCookieJar +SoupCookieJar: libsoup Reference Manual - + @@ -246,9 +246,8 @@

Returns

a new SoupCookieJar

-

-

Since 2.24

+

Since: 2.24

@@ -304,7 +303,7 @@ .

[nullable]

-

Since 2.24

+

Since: 2.24

@@ -361,7 +360,7 @@ .

[transfer full][element-type Soup.Cookie]

-

Since 2.40

+

Since: 2.40

@@ -407,7 +406,7 @@
-

Since 2.24

+

Since: 2.24

@@ -459,7 +458,7 @@
-

Since 2.30

+

Since: 2.30

@@ -496,7 +495,7 @@
-

Since 2.26

+

Since: 2.26

@@ -544,7 +543,7 @@
-

Since 2.40

+

Since: 2.40

@@ -577,7 +576,7 @@
-

Since 2.26

+

Since: 2.26

@@ -610,7 +609,7 @@ .

[transfer full][element-type Soup.Cookie]

-

Since 2.26

+

Since: 2.26

@@ -638,9 +637,8 @@

Returns

the SoupCookieJarAcceptPolicy set in the jar

-

-

Since 2.30

+

Since: 2.30

@@ -673,7 +671,7 @@
-

Since 2.30

+

Since: 2.30

@@ -701,9 +699,8 @@

Returns

TRUE if jar storage is persistent or FALSE otherwise.

-

-

Since 2.40

+

Since: 2.40

@@ -711,8 +708,6 @@

SoupCookieJar

typedef struct _SoupCookieJar SoupCookieJar;
-

-

@@ -762,7 +757,7 @@
-

Since 2.30

+

Since: 2.30

@@ -778,7 +773,7 @@ 
#define SOUP_COOKIE_JAR_ACCEPT_POLICY "accept-policy"

Alias for the “accept-policy” property.

-

Since 2.30

+

Since: 2.30

@@ -789,7 +784,7 @@

The policy the jar should follow to accept or reject cookies

Flags: Read / Write

Default value: SOUP_COOKIE_JAR_ACCEPT_ALWAYS

-

Since 2.30

+

Since: 2.30

@@ -860,7 +855,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupCookieJarText.html libsoup2.4-2.54.1/docs/reference/html/SoupCookieJarText.html --- libsoup2.4-2.52.2/docs/reference/html/SoupCookieJarText.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupCookieJarText.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupCookieJarText +SoupCookieJarText: libsoup Reference Manual - + @@ -153,9 +153,8 @@

Returns

the new SoupCookieJar

-

-

Since 2.26

+

Since: 2.26

@@ -163,8 +162,6 @@

SoupCookieJarText

typedef struct _SoupCookieJarText SoupCookieJarText;
-

-

@@ -187,7 +184,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupLogger.html libsoup2.4-2.54.1/docs/reference/html/SoupLogger.html --- libsoup2.4-2.52.2/docs/reference/html/SoupLogger.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupLogger.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupLogger +SoupLogger: libsoup Reference Manual - + @@ -51,22 +51,6 @@ -void - - -soup_logger_attach () - - - - -void - - -soup_logger_detach () - - - - SoupLoggerLogLevel @@ -242,84 +226,6 @@

Returns

a new SoupLogger

-

-
- -
-
-

soup_logger_attach ()

-
void
-soup_logger_attach (SoupLogger *logger,
-                    SoupSession *session);
-
-

soup_logger_attach is deprecated and should not be used in newly-written code.

-

Use soup_session_add_feature() instead.

-
-

Sets logger - to watch session - and print debug information for -its messages.

-

(The session will take a reference on logger -, which will be -removed when you call soup_logger_detach(), or when the session is -destroyed.)

-
-

Parameters

-
----- - - - - - - - - - - - - -

logger

a SoupLogger

 

session

a SoupSession

 
-
-
-
-
-

soup_logger_detach ()

-
void
-soup_logger_detach (SoupLogger *logger,
-                    SoupSession *session);
-
-

soup_logger_detach is deprecated and should not be used in newly-written code.

-

Use soup_session_remove_feature() instead.

-
-

Stops logger - from watching session -.

-
-

Parameters

-
----- - - - - - - - - - - - - -

logger

a SoupLogger

 

session

a SoupSession

 
@@ -335,7 +241,7 @@ message to log. Eg, it might choose between SOUP_LOGGER_LOG_BODY and SOUP_LOGGER_LOG_HEADERS depending on the Content-Type.

-

Parameters

+

Parameters

@@ -363,10 +269,9 @@
-

Returns

+

Returns

a SoupLoggerLogLevel value indicating how much of the message to log

-

@@ -386,7 +291,7 @@ will just always log requests at the level passed to soup_logger_new().)

-

Parameters

+

Parameters

@@ -436,7 +341,7 @@ will just always log responses at the level passed to soup_logger_new().)

-

Parameters

+

Parameters

@@ -500,7 +405,7 @@
-

Parameters

+

Parameters

@@ -549,7 +454,7 @@

Sets up an alternate log printing routine, if you don't want the log to go to stdout.

-

Parameters

+

Parameters

@@ -588,8 +493,6 @@

SoupLogger

typedef struct _SoupLogger SoupLogger;
-

-

@@ -641,7 +544,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupMessageBody.html libsoup2.4-2.54.1/docs/reference/html/SoupMessageBody.html --- libsoup2.4-2.52.2/docs/reference/html/SoupMessageBody.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupMessageBody.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupMessageBody +SoupMessageBody: libsoup Reference Manual - + @@ -307,7 +307,6 @@

Returns

the new SoupBuffer.

-

@@ -357,7 +356,6 @@

Returns

the new SoupBuffer.

-

@@ -441,7 +439,6 @@

Returns

the new SoupBuffer.

-

@@ -456,8 +453,9 @@

This function is exactly equivalent to soup_buffer_new() with SOUP_MEMORY_TAKE as first argument; it exists mainly for convenience and simplifying language bindings.

+

[rename-to soup_buffer_new]

-

Parameters

+

Parameters

@@ -480,11 +478,10 @@
-

Returns

+

Returns

the new SoupBuffer.

-

-

Since 2.32

+

Since: 2.32

@@ -552,7 +549,7 @@
-

Since 2.32

+

Since: 2.32

@@ -586,7 +583,6 @@

Returns

the new (or newly-reffed) buffer

-

@@ -646,7 +642,7 @@ as the SoupBuffer.

[transfer full]

-

Since 2.40

+

Since: 2.40

@@ -658,7 +654,6 @@

Returns

a new SoupMessageBody.

-

@@ -743,7 +738,7 @@ -

Since 2.24

+

Since: 2.24

@@ -772,9 +767,8 @@

Returns

the accumulate flag for body .

-

-

Since 2.24

+

Since: 2.24

@@ -874,8 +868,9 @@

This function is exactly equivalent to soup_message_body_append() with SOUP_MEMORY_TAKE as second argument; it exists mainly for convenience and simplifying language bindings.

+

[rename-to soup_message_body_append]

-

Parameters

+

Parameters

@@ -902,7 +897,7 @@
-

Since 2.32

+

Since: 2.32

@@ -982,7 +977,6 @@

a SoupBuffer containing the same data as body . (You must free this buffer if you do not want it.)

-

@@ -1076,7 +1070,7 @@ -

Since 2.24

+

Since: 2.24

@@ -1115,7 +1109,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1270,7 +1264,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupMessageHeaders.html libsoup2.4-2.54.1/docs/reference/html/SoupMessageHeaders.html --- libsoup2.4-2.52.2/docs/reference/html/SoupMessageHeaders.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupMessageHeaders.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupMessageHeaders +SoupMessageHeaders: libsoup Reference Manual - + @@ -111,13 +111,6 @@ -const char * - - -soup_message_headers_get () - - - SoupMessageHeadersType @@ -381,7 +374,6 @@

Returns

a new SoupMessageHeaders

-

@@ -579,7 +571,7 @@ -

Since 2.36

+

Since: 2.36

@@ -625,7 +617,7 @@

the header's value or NULL if not found.

[nullable]

-

Since 2.28

+

Since: 2.28

@@ -675,56 +667,7 @@

the header's value or NULL if not found.

[nullable]

-

Since 2.28

- -
-
-

soup_message_headers_get ()

-
const char *
-soup_message_headers_get (SoupMessageHeaders *hdrs,
-                          const char *name);
-
-

soup_message_headers_get is deprecated and should not be used in newly-written code.

-

Use soup_message_headers_get_one() or -soup_message_headers_get_list() instead.

-
-

Gets the value of header name - in hdrs -.

-

This method was supposed to work correctly for both single-valued -and list-valued headers, but because some HTTP clients/servers -mistakenly send multiple copies of headers that are supposed to be -single-valued, it sometimes returns incorrect results. To fix this, -the methods soup_message_headers_get_one() and -soup_message_headers_get_list() were introduced, so callers can -explicitly state which behavior they are expecting.

-
-

Parameters

-
----- - - - - - - - - - - - - -

hdrs

a SoupMessageHeaders

 

name

header name

 
-
-
-

Returns

-

as with soup_message_headers_get_list().

-

[nullable]

-
+

Since: 2.28

@@ -733,7 +676,7 @@ soup_message_headers_get_headers_type (SoupMessageHeaders *hdrs);

Gets the type of headers.

-

Parameters

+

Parameters

@@ -748,11 +691,10 @@
-

Returns

+

Returns

the header's type.

-

-

Since 2.50

+

Since: 2.50

@@ -771,7 +713,7 @@ , then this is equivalent to calling soup_header_contains() on its value.)

-

Parameters

+

Parameters

@@ -798,13 +740,12 @@
-

Returns

+

Returns

TRUE if the header is present and contains token , FALSE otherwise.

-

-

Since 2.50

+

Since: 2.50

@@ -819,7 +760,7 @@ (case-insensitively) equal to value .

-

Parameters

+

Parameters

@@ -846,13 +787,12 @@
-

Returns

+

Returns

TRUE if the header is present and its value is value , FALSE otherwise.

-

-

Since 2.50

+

Since: 2.50

@@ -863,7 +803,7 @@ gpointer user_data);

The callback passed to soup_message_headers_foreach().

-

Parameters

+

Parameters

@@ -900,7 +840,7 @@

Calls func once for each header value in hdrs .

-

Beware that unlike soup_message_headers_get(), this processes the +

Beware that unlike soup_message_headers_get(), this processes the headers in exactly the way they were added, rather than concatenating multiple same-named headers into a single value. (This is intentional; it ensures that if you call @@ -911,7 +851,7 @@

You may not modify the headers from func .

-

Parameters

+

Parameters

@@ -949,7 +889,7 @@ for iterating hdrs .

-

Parameters

+

Parameters

@@ -988,7 +928,7 @@ and value will be unchanged.

-

Parameters

+

Parameters

@@ -1017,10 +957,9 @@
-

Returns

+

Returns

TRUE if another name and value were returned, FALSE if the end of the headers has been reached.

-

@@ -1034,7 +973,7 @@ response may declare a Content-Length or Transfer-Encoding, but it will never actually include a body.

-

Parameters

+

Parameters

@@ -1049,10 +988,9 @@
-

Returns

+

Returns

the encoding declared by hdrs .

-

@@ -1066,7 +1004,7 @@ you should use this if you are going to send a request or response in chunked encoding.

-

Parameters

+

Parameters

@@ -1099,7 +1037,7 @@ be non-0 if soup_message_headers_get_encoding() returns SOUP_ENCODING_CONTENT_LENGTH.

-

Parameters

+

Parameters

@@ -1114,10 +1052,9 @@
-

Returns

+

Returns

the message body length declared by hdrs .

-

@@ -1141,7 +1078,7 @@ correct content length into the response without needing to waste memory by filling in a response body which won't actually be sent.

-

Parameters

+

Parameters

@@ -1173,7 +1110,7 @@ Currently this will either be SOUP_EXPECTATION_CONTINUE or SOUP_EXPECTATION_UNRECOGNIZED.

-

Parameters

+

Parameters

@@ -1188,10 +1125,9 @@
-

Returns

+

Returns

the contents of hdrs 's "Expect" header

-

@@ -1212,7 +1148,7 @@ saves you from having to transmit the large request body when the server is just going to ignore it anyway.

-

Parameters

+

Parameters

@@ -1248,7 +1184,7 @@ can be NULL if you are only interested in the content type itself.

-

Parameters

+

Parameters

@@ -1271,7 +1207,7 @@
-

Returns

+

Returns

a string with the value of the "Content-Type" header or NULL if hdrs does not contain that @@ -1280,7 +1216,7 @@ unchanged).

[nullable]

-

Since 2.26

+

Since: 2.26

@@ -1295,7 +1231,7 @@ optionally with additional parameters specified in params .

-

Parameters

+

Parameters

@@ -1322,7 +1258,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1352,7 +1288,7 @@ this is handled automatically by SoupMultipart and the associated form methods.

-

Parameters

+

Parameters

@@ -1381,15 +1317,14 @@
-

Returns

+

Returns

TRUE if hdrs contains a "Content-Disposition" header, FALSE if not (in which case *disposition and *params will be unchanged).

-

-

Since 2.26

+

Since: 2.26

@@ -1407,7 +1342,7 @@

See soup_message_headers_get_content_disposition() for a discussion of how Content-Disposition is used in HTTP.

-

Parameters

+

Parameters

@@ -1434,7 +1369,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1475,7 +1410,7 @@ actually requested by the client.

-

Parameters

+

Parameters

@@ -1508,15 +1443,14 @@
-

Returns

+

Returns

TRUE if hdrs contained a syntactically-valid "Range" header, FALSE otherwise (in which case range and length will not be set).

-

-

Since 2.26

+

Since: 2.26

@@ -1530,7 +1464,7 @@ only want to request a single range, you can use soup_message_headers_set_range().)

-

Parameters

+

Parameters

@@ -1557,7 +1491,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1574,7 +1508,7 @@

If you need to request multiple ranges, use soup_message_headers_set_ranges().

-

Parameters

+

Parameters

@@ -1600,7 +1534,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1610,7 +1544,7 @@ SoupRange *ranges);

Frees the array of ranges returned from soup_message_headers_get_ranges().

-

Parameters

+

Parameters

@@ -1631,7 +1565,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1651,7 +1585,7 @@ was specified as "*", then total_length will be set to -1.

-

Parameters

+

Parameters

@@ -1684,13 +1618,12 @@
-

Returns

+

Returns

TRUE if hdrs contained a "Content-Range" header containing a byte range which could be parsed, FALSE otherwise.

-

-

Since 2.26

+

Since: 2.26

@@ -1714,7 +1647,7 @@ soup_message_headers_get_ranges() for more details.

-

Parameters

+

Parameters

@@ -1745,7 +1678,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1957,7 +1890,7 @@
-

Since 2.26

+

Since: 2.26

@@ -1966,7 +1899,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupMessage.html libsoup2.4-2.54.1/docs/reference/html/SoupMessage.html --- libsoup2.4-2.52.2/docs/reference/html/SoupMessage.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupMessage.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupMessage +SoupMessage: libsoup Reference Manual - + @@ -215,14 +215,6 @@ void -soup_message_set_chunk_allocator () - - - - -void - - soup_message_disable_feature () @@ -642,7 +634,6 @@

Returns

the new SoupMessage

-

@@ -808,7 +799,6 @@

Returns

the HTTP version

-

@@ -905,7 +895,7 @@ 's URI points to.

[transfer none]

-

Since 2.26

+

Since: 2.26

@@ -1028,7 +1018,7 @@
-

Since 2.38

+

Since: 2.38

@@ -1058,7 +1048,6 @@

Returns

TRUE or FALSE.

-

@@ -1109,9 +1098,8 @@

Returns

TRUE if msg used/attempted https, FALSE if not

-

-

Since 2.34

+

Since: 2.34

@@ -1147,7 +1135,7 @@
-

Since 2.30

+

Since: 2.30

@@ -1177,7 +1165,7 @@ 's first party SoupURI.

[transfer none]

-

Since 2.30

+

Since: 2.30

@@ -1199,8 +1187,9 @@ the response_headers for a server SoupMessage) contain a header named header .

+

[skip]

-

Parameters

+

Parameters

@@ -1238,9 +1227,8 @@
-

Returns

+

Returns

the handler ID from g_signal_connect()

-

@@ -1266,8 +1254,9 @@ is set. For a client SoupMessage, this means it can't be a "wrote" signal. For a server SoupMessage, this means it can't be a "got" signal.

+

[skip]

-

Parameters

+

Parameters

@@ -1305,9 +1294,8 @@
-

Returns

+

Returns

the handler ID from g_signal_connect()

-

@@ -1366,7 +1354,6 @@

Returns

the flags

-

@@ -1417,7 +1404,7 @@

user_data

-

the data passed to soup_message_set_chunk_allocator()

+

the data passed to soup_message_set_chunk_allocator()

  @@ -1431,85 +1418,6 @@
-

soup_message_set_chunk_allocator ()

-
void
-soup_message_set_chunk_allocator (SoupMessage *msg,
-                                  SoupChunkAllocator allocator,
-                                  gpointer user_data,
-                                  GDestroyNotify destroy_notify);
-
-

soup_message_set_chunk_allocator is deprecated and should not be used in newly-written code.

-

SoupRequest provides a much simpler API that lets you -read the response directly into your own buffers without needing to -mess with callbacks, pausing/unpausing, etc.

-
-

Sets an alternate chunk-allocation function to use when reading -msg -'s body when using the traditional (ie, -non-SoupRequest-based) API. Every time data is available -to read, libsoup will call allocator -, which should return a -SoupBuffer. (See SoupChunkAllocator for additional details.) -Libsoup will then read data from the network into that buffer, and -update the buffer's length to indicate how much -data it read.

-

Generally, a custom chunk allocator would be used in conjunction -with soup_message_body_set_accumulate() FALSE and -“got_chunk”, as part of a strategy to avoid unnecessary -copying of data. However, you cannot assume that every call to the -allocator will be followed by a call to your -“got_chunk” handler; if an I/O error occurs, then the -buffer will be unreffed without ever having been used. If your -buffer-allocation strategy requires special cleanup, use -soup_buffer_new_with_owner() rather than doing the cleanup from the -“got_chunk” handler.

-

The other thing to remember when using non-accumulating message -bodies is that the buffer passed to the “got_chunk” -handler will be unreffed after the handler returns, just as it -would be in the non-custom-allocated case. If you want to hand the -chunk data off to some other part of your program to use later, -you'll need to ref the SoupBuffer (or its owner, in the -soup_buffer_new_with_owner() case) to ensure that the data remains -valid.

-
-

Parameters

-
----- - - - - - - - - - - - - - - - - - - - - - - -

msg

a SoupMessage

 

allocator

the chunk allocator callback

 

user_data

data to pass to allocator -

 

destroy_notify

destroy notifier to free user_data -when msg -is -destroyed

 
-
-
-
-

soup_message_disable_feature ()

void
 soup_message_disable_feature (SoupMessage *msg,
@@ -1529,7 +1437,7 @@
 you cannot call this on a message that is being requeued after a
 redirect or authentication.

 

-
Parameters

+
Parameters

 
@@ -1550,7 +1458,7 @@
 

 
 

 

 

-
Since 2.28

+
Since: 2.28
@@ -1561,7 +1469,7 @@ is associated with a SoupRequest, this returns that request. Otherwise it returns NULL.

-

Parameters

+

Parameters

@@ -1576,12 +1484,12 @@
-

Returns

+

Returns

msg 's associated SoupRequest.

[transfer none]

-

Since 2.42

+

Since: 2.42

@@ -1591,7 +1499,7 @@

Retrieves the SoupMessagePriority. If not set this value defaults to SOUP_MESSAGE_PRIORITY_NORMAL.

-

Parameters

+

Parameters

@@ -1606,11 +1514,10 @@
-

Returns

+

Returns

the priority of the message.

-

-

Since 2.44

+

Since: 2.44

@@ -1629,7 +1536,7 @@ the synchronous/blocking case, priority ends up being determined semi-randomly by thread scheduling.

-

Parameters

+

Parameters

@@ -1650,7 +1557,7 @@
-

Since 2.44

+

Since: 2.44

@@ -2020,7 +1927,7 @@

Alias for the “first-party” property. (The SoupURI loaded in the application when the message was queued.)

-

Since 2.30

+

Since: 2.30

@@ -2029,7 +1936,7 @@

Sets the priority of the SoupMessage. See soup_message_set_priority() for further details.

-

Since 2.44

+

Since: 2.44

@@ -2046,7 +1953,7 @@

Alias for the “request-body-data” property. (The message's HTTP request body, as a GBytes.)

-

Since 2.46

+

Since: 2.46

@@ -2071,7 +1978,7 @@

Alias for the “response-body-data” property. (The message's HTTP response body, as a GBytes.)

-

Since 2.46

+

Since: 2.46

@@ -2088,7 +1995,7 @@

Alias for the “tls-certificate” property. (The TLS certificate associated with the message, if any.)

-

Since 2.34

+

Since: 2.34

@@ -2097,7 +2004,7 @@

Alias for the “tls-errors” property. (The verification errors on “tls-certificate”.)

-

Since 2.34

+

Since: 2.34

@@ -2108,7 +2015,7 @@

The SoupURI loaded in the application when the message was queued.

Flags: Read / Write

-

Since 2.30

+

Since: 2.30

@@ -2162,7 +2069,7 @@ 
  “request-body-data”        GBytes *

The message's HTTP request body, as a GBytes.

Flags: Read

-

Since 2.46

+

Since: 2.46

@@ -2184,7 +2091,7 @@ 
  “response-body-data”       GBytes *

The message's HTTP response body, as a GBytes.

Flags: Read

-

Since 2.46

+

Since: 2.46

@@ -2216,7 +2123,7 @@ 
  “tls-certificate”          GTlsCertificate *

The GTlsCertificate associated with the message

Flags: Read / Write

-

Since 2.34

+

Since: 2.34

@@ -2224,7 +2131,7 @@ 
  “tls-errors”               GTlsCertificateFlags

The verification errors on “tls-certificate”

Flags: Read / Write

-

Since 2.34

+

Since: 2.34

@@ -2294,7 +2201,7 @@

Flags: Run First

-

Since 2.28

+

Since: 2.28

@@ -2556,7 +2463,7 @@

Flags: Run First

-

Since 2.38

+

Since: 2.38

@@ -2622,7 +2529,7 @@

Flags: Run First

-

Since 2.50

+

Since: 2.50

@@ -2700,7 +2607,7 @@

Flags: Run First

-

Since 2.24

+

Since: 2.24

@@ -2812,7 +2719,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupMultipart.html libsoup2.4-2.54.1/docs/reference/html/SoupMultipart.html --- libsoup2.4-2.52.2/docs/reference/html/SoupMultipart.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupMultipart.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupMultipart +SoupMultipart: libsoup Reference Manual - + @@ -171,9 +171,8 @@

Returns

a new empty SoupMultipart of the given mime_type

-

-

Since 2.26

+

Since: 2.26

@@ -212,7 +211,7 @@ message couldn't be parsed or wasn't multipart).

[nullable]

-

Since 2.26

+

Since: 2.26

@@ -236,7 +235,7 @@
-

Since 2.26

+

Since: 2.26

@@ -264,9 +263,8 @@

Returns

the number of body parts in multipart

-

-

Since 2.26

+

Since: 2.26

@@ -319,9 +317,8 @@ which case headers and body won't be set)

-

-

Since 2.26

+

Since: 2.26

@@ -364,7 +361,7 @@
-

Since 2.26

+

Since: 2.26

@@ -407,7 +404,7 @@
-

Since 2.26

+

Since: 2.26

@@ -461,7 +458,7 @@
-

Since 2.26

+

Since: 2.26

@@ -503,7 +500,7 @@
-

Since 2.26

+

Since: 2.26

@@ -522,7 +519,7 @@ have "binary" Content-Transfer-Encoding, even if its headers explicitly state otherwise. In other words, don't try to use SoupMultipart for handling real MIME multiparts.

-

Since 2.26

+

Since: 2.26

@@ -531,7 +528,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupMultipartInputStream.html libsoup2.4-2.54.1/docs/reference/html/SoupMultipartInputStream.html --- libsoup2.4-2.52.2/docs/reference/html/SoupMultipartInputStream.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupMultipartInputStream.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupMultipartInputStream +SoupMultipartInputStream: libsoup Reference Manual - + @@ -181,9 +181,8 @@

Returns

a new SoupMultipartInputStream

-

-

Since 2.40

+

Since: 2.40

@@ -221,7 +220,7 @@ NULL if the headers failed to parse.

[nullable][transfer none]

-

Since 2.40

+

Since: 2.40

@@ -273,7 +272,7 @@ NULL if there are no more parts.

[nullable][transfer full]

-

Since 2.40

+

Since: 2.40

@@ -326,7 +325,7 @@
-

Since 2.40

+

Since: 2.40

@@ -371,7 +370,7 @@ more parts.

[nullable][transfer full]

-

Since 2.40

+

Since: 2.40

@@ -379,8 +378,6 @@

struct SoupMultipartInputStream

struct SoupMultipartInputStream;
-

-

@@ -394,7 +391,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupProxyResolverDefault.html libsoup2.4-2.54.1/docs/reference/html/SoupProxyResolverDefault.html --- libsoup2.4-2.52.2/docs/reference/html/SoupProxyResolverDefault.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupProxyResolverDefault.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupProxyResolverDefault +SoupProxyResolverDefault: libsoup Reference Manual - + @@ -93,14 +93,13 @@

Functions

+

Types and Values

SoupProxyResolverDefault

typedef struct _SoupProxyResolverDefault SoupProxyResolverDefault;
-

-

@@ -114,7 +113,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupRequestData.html libsoup2.4-2.54.1/docs/reference/html/SoupRequestData.html --- libsoup2.4-2.52.2/docs/reference/html/SoupRequestData.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupRequestData.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupRequestData +SoupRequestData: libsoup Reference Manual - + @@ -70,19 +70,17 @@

Functions

+

Types and Values

SoupRequestData

typedef struct _SoupRequestData SoupRequestData;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupRequestFile.html libsoup2.4-2.54.1/docs/reference/html/SoupRequestFile.html --- libsoup2.4-2.52.2/docs/reference/html/SoupRequestFile.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupRequestFile.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupRequestFile +SoupRequestFile: libsoup Reference Manual - + @@ -115,7 +115,7 @@ .

[transfer full]

-

Since 2.40

+

Since: 2.40

@@ -123,13 +123,10 @@

SoupRequestFile

typedef struct _SoupRequestFile SoupRequestFile;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupRequest.html libsoup2.4-2.54.1/docs/reference/html/SoupRequest.html --- libsoup2.4-2.52.2/docs/reference/html/SoupRequest.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupRequest.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupRequest +SoupRequest: libsoup Reference Manual - + @@ -219,7 +219,7 @@ .

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -267,7 +267,7 @@
-

Since 2.42

+

Since: 2.42

@@ -311,7 +311,7 @@ .

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -342,9 +342,8 @@

the length of the data represented by request , or -1 if not known.

-

-

Since 2.42

+

Since: 2.42

@@ -379,7 +378,7 @@ , or NULL if not known.

[nullable]

-

Since 2.42

+

Since: 2.42

@@ -409,7 +408,7 @@ 's SoupSession.

[transfer none]

-

Since 2.42

+

Since: 2.42

@@ -439,7 +438,7 @@ 's URI.

[transfer none]

-

Since 2.42

+

Since: 2.42

@@ -448,7 +447,7 @@

SoupRequest

typedef struct _SoupRequest SoupRequest;

A request to retrieve a particular URI.

-

Since 2.42

+

Since: 2.42

@@ -456,7 +455,7 @@ 
#define SOUP_REQUEST_SESSION "session"

Alias for the “session” property, qv.

-

Since 2.42

+

Since: 2.42

@@ -464,7 +463,7 @@ 
#define SOUP_REQUEST_URI     "uri"

Alias for the “uri” property, qv.

-

Since 2.42

+

Since: 2.42

@@ -474,7 +473,7 @@ 
  “session”                  SoupSession *

The request's SoupSession.

Flags: Read / Write / Construct Only

-

Since 2.42

+

Since: 2.42

@@ -482,12 +481,11 @@ 
  “uri”                      SoupURI *

The request URI.

Flags: Read / Write / Construct Only

-

Since 2.42

+

Since: 2.42

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupRequestHTTP.html libsoup2.4-2.54.1/docs/reference/html/SoupRequestHTTP.html --- libsoup2.4-2.52.2/docs/reference/html/SoupRequestHTTP.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupRequestHTTP.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupRequestHTTP +SoupRequestHTTP: libsoup Reference Manual - + @@ -116,7 +116,7 @@

a new reference to the SoupMessage.

[transfer full]

-

Since 2.40

+

Since: 2.40

@@ -124,13 +124,10 @@

SoupRequestHTTP

typedef struct _SoupRequestHTTP SoupRequestHTTP;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupServer.html libsoup2.4-2.54.1/docs/reference/html/SoupServer.html --- libsoup2.4-2.52.2/docs/reference/html/SoupServer.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupServer.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupServer +SoupServer: libsoup Reference Manual - + @@ -599,9 +599,8 @@

Returns

success or failure.

-

-

Since 2.48

+

Since: 2.48

@@ -671,9 +670,8 @@ bound or any other error occurred (in which case error will be set).

-

-

Since 2.48

+

Since: 2.48

@@ -735,9 +733,8 @@ could not be bound or any other error occurred (in which case error will be set).

-

-

Since 2.48

+

Since: 2.48

@@ -799,9 +796,8 @@ could not be bound or any other error occurred (in which case error will be set).

-

-

Since 2.48

+

Since: 2.48

@@ -853,9 +849,8 @@

TRUE on success, FALSE if an error occurred (in which case error will be set).

-

-

Since 2.48

+

Since: 2.48

@@ -911,9 +906,8 @@

TRUE on success, FALSE if an error occurred (in which case error will be set).

-

-

Since 2.48

+

Since: 2.48

@@ -983,7 +977,7 @@ SoupURIs, which you must free when you are done with it.

[transfer full][element-type Soup.URI]

-

Since 2.48

+

Since: 2.48

@@ -1054,7 +1048,6 @@

Returns

TRUE if server is configured to serve https.

-

@@ -1113,9 +1106,8 @@ accepted or any other error occurred (in which case error will be set).

-

-

Since 2.50

+

Since: 2.50

@@ -1365,7 +1357,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1429,17 +1421,17 @@   -

connection

-

the newly created WebSocket connection

-  - -

path

the path component of msg 's Request-URI

  +

connection

+

the newly created WebSocket connection

+  + +

client

additional contextual information about the client

  @@ -1569,7 +1561,7 @@ NULL if you used soup_server_accept_iostream().

[nullable][transfer none]

-

Since 2.48

+

Since: 2.48

@@ -1601,7 +1593,7 @@ NULL if you used soup_server_accept_iostream().

[nullable][transfer none]

-

Since 2.48

+

Since: 2.48

@@ -1730,7 +1722,7 @@ associated with, NULL if you used soup_server_accept_iostream().

[nullable][transfer none]

-

Since 2.48

+

Since: 2.48

@@ -1774,7 +1766,7 @@ is returned.

[transfer full]

-

Since 2.50

+

Since: 2.50

@@ -1932,8 +1924,6 @@

SoupServer

typedef struct _SoupServer SoupServer;
-

-

@@ -1978,7 +1968,7 @@
-

Since 2.48

+

Since: 2.48

@@ -2002,7 +1992,7 @@ 
#define SOUP_SERVER_TLS_CERTIFICATE "tls-certificate"

Alias for the “tls-certificate” property, qv.

-

Since 2.38

+

Since: 2.38

@@ -2026,7 +2016,7 @@ 
#define SOUP_SERVER_HTTP_ALIASES    "http-aliases"

Alias for the “http-aliases” property, qv.

-

Since 2.44

+

Since: 2.44

@@ -2034,7 +2024,7 @@ 
#define SOUP_SERVER_HTTPS_ALIASES   "https-aliases"

Alias for the “https-aliases” property, qv.

-

Since 2.44

+

Since: 2.44

@@ -2071,7 +2061,7 @@ "http".

See also “https-aliases”.

Flags: Read / Write

-

Since 2.44

+

Since: 2.44

@@ -2083,7 +2073,7 @@

The default value is NULL, meaning that no URI schemes are considered aliases for "https".

Flags: Read / Write

-

Since 2.44

+

Since: 2.44

@@ -2200,7 +2190,7 @@

Alternatively, you can call soup_server_set_ssl_cert_file() to have SoupServer read in a a certificate from a file.

Flags: Read / Write / Construct Only

-

Since 2.38

+

Since: 2.38

@@ -2412,7 +2402,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupSessionAsync.html libsoup2.4-2.54.1/docs/reference/html/SoupSessionAsync.html --- libsoup2.4-2.52.2/docs/reference/html/SoupSessionAsync.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupSessionAsync.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupSessionAsync +SoupSessionAsync: libsoup Reference Manual - + @@ -34,33 +34,6 @@
-

Functions

-
---- - - - - - - - - - - -
-SoupSession * - -soup_session_async_new () -
-SoupSession * - -soup_session_async_new_with_options () -
-
-

Types and Values

@@ -95,77 +68,17 @@

Functions

-
-

soup_session_async_new ()

-
SoupSession *
-soup_session_async_new (void);
-
-

soup_session_async_new is deprecated and should not be used in newly-written code.

-

SoupSessionAsync is deprecated; use a plain -SoupSession, created with soup_session_new(). See the porting guide.

-
-

Creates an asynchronous SoupSession with the default options.

-
-

Returns

-

the new session.

-
-
-
-

soup_session_async_new_with_options ()

-
SoupSession *
-soup_session_async_new_with_options (const char *optname1,
-                                     ...);
-
-

soup_session_async_new_with_options is deprecated and should not be used in newly-written code.

-

SoupSessionAsync is deprecated; use a plain -SoupSession, created with soup_session_new_with_options(). See the

-porting guide. -
-

Creates an asynchronous SoupSession with the specified options.

-
-

Parameters

-
----- - - - - - - - - - - - - -

optname1

name of first property to set

 

...

value of optname1 -, followed by additional property/value pairs

 
-
-
-

Returns

-

the new session.

-

-
- -

Types and Values

SoupSessionAsync

typedef struct _SoupSessionAsync SoupSessionAsync;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupSessionFeature.html libsoup2.4-2.54.1/docs/reference/html/SoupSessionFeature.html --- libsoup2.4-2.52.2/docs/reference/html/SoupSessionFeature.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupSessionFeature.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupSessionFeature +SoupSessionFeature: libsoup Reference Manual - + @@ -87,6 +87,7 @@

Functions

+

Types and Values

@@ -95,7 +96,7 @@ 
typedef struct _SoupSessionFeature SoupSessionFeature;

An object that implement some sort of optional feature for SoupSession.

-

Since 2.24

+

Since: 2.24

@@ -186,12 +187,11 @@
-

Since 2.24

+

Since: 2.24

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupSession.html libsoup2.4-2.54.1/docs/reference/html/SoupSession.html --- libsoup2.4-2.52.2/docs/reference/html/SoupSession.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupSession.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupSession +SoupSession: libsoup Reference Manual - + @@ -183,14 +183,6 @@ void -soup_session_prepare_for_uri () - - - - -void - - soup_session_abort () @@ -666,9 +658,8 @@

Returns

the new session.

-

-

Since 2.42

+

Since: 2.42

@@ -703,9 +694,8 @@

Returns

the new session.

-

-

Since 2.42

+

Since: 2.42

@@ -749,7 +739,7 @@ NULL on error.

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -793,7 +783,7 @@ NULL on error.

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -846,7 +836,7 @@ NULL on error.

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -899,7 +889,7 @@ NULL on error.

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -1080,7 +1070,6 @@

Returns

the HTTP status code of the response

-

@@ -1217,7 +1206,7 @@ response body, or NULL on error.

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -1282,7 +1271,7 @@
-

Since 2.42

+

Since: 2.42

@@ -1327,7 +1316,7 @@ response body, or NULL on error.

[transfer full]

-

Since 2.42

+

Since: 2.42

@@ -1407,7 +1396,7 @@
-

Since 2.50

+

Since: 2.50

@@ -1453,7 +1442,7 @@ NULL on error.

[transfer full]

-

Since 2.50

+

Since: 2.50

@@ -1514,47 +1503,7 @@
-

Since 2.38

- -
-
-

soup_session_prepare_for_uri ()

-
void
-soup_session_prepare_for_uri (SoupSession *session,
-                              SoupURI *uri);
-
-

soup_session_prepare_for_uri has been deprecated since version 2.38 and should not be used in newly-written code.

-

use soup_session_prefetch_dns() instead

-
-

Tells session - that uri - may be requested shortly, and so the -session can try to prepare (resolving the domain name, obtaining -proxy address, etc.) in order to work more quickly once the URI is -actually requested.

-
-

Parameters

-
----- - - - - - - - - - - - - -

session

a SoupSession

 

uri

a SoupURI which may be required

 
-
-

Since 2.30

+

Since: 2.38

@@ -1570,7 +1519,7 @@ soup_session_abort() returns. Requests on a plain SoupSession will not.

-

Parameters

+

Parameters

@@ -1598,7 +1547,7 @@ 's SOUP_MESSAGE_NO_REDIRECT flag, and the number of times it has already been redirected).

-

Parameters

+

Parameters

@@ -1620,12 +1569,11 @@
-

Returns

+

Returns

whether msg would be redirected

-

-

Since 2.38

+

Since: 2.38

@@ -1649,7 +1597,7 @@ has already been redirected too many times, this will cause it to fail with SOUP_STATUS_TOO_MANY_REDIRECTS.

-

Parameters

+

Parameters

@@ -1671,13 +1619,12 @@
-

Returns

+

Returns

TRUE if a redirection was applied, FALSE if not (eg, because there was no Location header, or it could not be parsed).

-

-

Since 2.38

+

Since: 2.38

@@ -1691,7 +1638,7 @@

This may only be called for asynchronous messages (those sent on a SoupSessionAsync or using soup_session_queue_message()).

-

Parameters

+

Parameters

@@ -1731,7 +1678,7 @@

This may only be called for asynchronous messages (those sent on a SoupSessionAsync or using soup_session_queue_message()).

-

Parameters

+

Parameters

@@ -1766,7 +1713,7 @@

For a modern SoupSession, this will always just return the thread-default GMainContext, and so is not especially useful.

-

Parameters

+

Parameters

@@ -1781,7 +1728,7 @@
-

Returns

+

Returns

session 's GMainContext, which may be NULL.

@@ -1802,7 +1749,7 @@

See the main SoupSession documentation for information on what features are present in sessions by default.

-

Parameters

+

Parameters

@@ -1823,7 +1770,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1849,7 +1796,7 @@

See the main SoupSession documentation for information on what features are present in sessions by default.

-

Parameters

+

Parameters

@@ -1870,7 +1817,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1882,7 +1829,7 @@ 's functionality from session .

-

Parameters

+

Parameters

@@ -1904,7 +1851,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1920,7 +1867,7 @@ from the session at construct time by using the SOUP_SESSION_REMOVE_FEATURE_BY_TYPE property.

-

Parameters

+

Parameters

@@ -1941,7 +1888,7 @@
-

Since 2.24

+

Since: 2.24

@@ -1956,7 +1903,7 @@ for feature_type .)

-

Parameters

+

Parameters

@@ -1978,11 +1925,11 @@
-

Returns

+

Returns

a list of features. You must free the list, but not its contents.

[transfer container][element-type Soup.SessionFeature]

-

Since 2.26

+

Since: 2.26

@@ -1996,7 +1943,7 @@ features where there may be more than one feature of a given type, use soup_session_get_features().

-

Parameters

+

Parameters

@@ -2018,13 +1965,13 @@
-

Returns

+

Returns

a SoupSessionFeature, or NULL. The feature is owned by session .

[nullable][transfer none]

-

Since 2.26

+

Since: 2.26

@@ -2046,7 +1993,7 @@ , and the second is not, then this will return NULL, not the second feature.

-

Parameters

+

Parameters

@@ -2073,13 +2020,13 @@
-

Returns

+

Returns

a SoupSessionFeature, or NULL. The feature is owned by session .

[nullable][transfer none]

-

Since 2.28

+

Since: 2.28

@@ -2094,7 +2041,7 @@ some class managed by another feature, such as SoupAuth or SoupRequest).

-

Parameters

+

Parameters

@@ -2116,11 +2063,10 @@
-

Returns

+

Returns

TRUE or FALSE

-

-

Since 2.42

+

Since: 2.42

@@ -2140,7 +2086,7 @@ to be freed if you are not holding any other reference to it.

-

Parameters

+

Parameters

@@ -2162,7 +2108,7 @@
-

Returns

+

Returns

the GIOStream formerly associated with msg (or NULL if msg @@ -2171,7 +2117,7 @@ is returned.

[transfer full]

-

Since 2.50

+

Since: 2.50

@@ -2179,8 +2125,6 @@

SoupSession

typedef struct _SoupSession SoupSession;
-

-

@@ -2229,7 +2173,7 @@
-

Since 2.42

+

Since: 2.42

@@ -2238,7 +2182,7 @@

A GError domain for SoupRequest-related errors. Used with SoupRequestError.

-

Since 2.42

+

Since: 2.42

@@ -2274,7 +2218,7 @@ 
#define SOUP_SESSION_TLS_DATABASE           "tls-database"

Alias for the “tls-database” property, qv.

-

Since 2.38

+

Since: 2.38

@@ -2283,7 +2227,7 @@

Alias for the “ssl-use-system-ca-file” property, qv.

-

Since 2.38

+

Since: 2.38

@@ -2298,7 +2242,7 @@ 
#define SOUP_SESSION_SSL_STRICT             "ssl-strict"

Alias for the “ssl-strict” property, qv.

-

Since 2.30

+

Since: 2.30

@@ -2306,7 +2250,7 @@ 
#define SOUP_SESSION_TLS_INTERACTION        "tls-interaction"

Alias for the “tls-interaction” property, qv.

-

Since 2.48

+

Since: 2.48

@@ -2321,7 +2265,7 @@ 
#define SOUP_SESSION_USE_THREAD_CONTEXT     "use-thread-context"

Alias for the “use-thread-context” property, qv.

-

Since 2.38

+

Since: 2.38

@@ -2336,7 +2280,7 @@ 
#define SOUP_SESSION_IDLE_TIMEOUT           "idle-timeout"

Alias for the “idle-timeout” property, qv.

-

Since 2.24

+

Since: 2.24

@@ -2351,7 +2295,7 @@ 
#define SOUP_SESSION_ADD_FEATURE            "add-feature"

Alias for the “add-feature” property, qv.

-

Since 2.24

+

Since: 2.24

@@ -2359,7 +2303,7 @@ 
#define SOUP_SESSION_ADD_FEATURE_BY_TYPE    "add-feature-by-type"

Alias for the “add-feature-by-type” property, qv.

-

Since 2.24

+

Since: 2.24

@@ -2368,7 +2312,7 @@

Alias for the “remove-feature-by-type” property, qv.

-

Since 2.24

+

Since: 2.24

@@ -2376,7 +2320,7 @@ 
#define SOUP_SESSION_ACCEPT_LANGUAGE        "accept-language"

Alias for the “accept-language” property, qv.

-

Since 2.30

+

Since: 2.30

@@ -2384,7 +2328,7 @@ 
#define SOUP_SESSION_ACCEPT_LANGUAGE_AUTO   "accept-language-auto"

Alias for the “accept-language-auto” property, qv.

-

Since 2.30

+

Since: 2.30

@@ -2392,7 +2336,7 @@ 
#define SOUP_SESSION_HTTP_ALIASES       "http-aliases"

Alias for the “http-aliases” property, qv.

-

Since 2.38

+

Since: 2.38

@@ -2400,7 +2344,7 @@ 
#define SOUP_SESSION_HTTPS_ALIASES      "https-aliases"

Alias for the “https-aliases” property, qv.

-

Since 2.38

+

Since: 2.38

@@ -2408,7 +2352,7 @@ 
#define SOUP_SESSION_LOCAL_ADDRESS          "local-address"

Alias for the “local-address” property, qv.

-

Since 2.42

+

Since: 2.42

@@ -2422,7 +2366,7 @@ “accept-language-auto”.

Flags: Read / Write

Default value: NULL

-

Since 2.30

+

Since: 2.30

@@ -2435,7 +2379,7 @@ “accept-language”.

Flags: Read / Write

Default value: FALSE

-

Since 2.30

+

Since: 2.30

@@ -2443,8 +2387,9 @@ 
  “add-feature”              SoupSessionFeature *

Add a feature object to the session. (Shortcut for calling soup_session_add_feature().)

+

[skip]

Flags: Read / Write

-

Since 2.24

+

Since: 2.24

@@ -2452,9 +2397,10 @@ 
  “add-feature-by-type”      GType *

Add a feature object of the given type to the session. (Shortcut for calling soup_session_add_feature_by_type().)

+

[skip]

Flags: Read / Write

Allowed values: GObject

-

Since 2.24

+

Since: 2.24

@@ -2491,7 +2437,7 @@ be an alias for "http".

See also “https-aliases”.

Flags: Read / Write

-

Since 2.38

+

Since: 2.38

@@ -2503,7 +2449,7 @@

The default value is NULL, meaning that no URI schemes are considered aliases for "https".

Flags: Read / Write

-

Since 2.38

+

Since: 2.38

@@ -2522,7 +2468,7 @@ connections will never time out).

Flags: Read / Write

Default value: 60

-

Since 2.24

+

Since: 2.24

@@ -2533,7 +2479,7 @@

Use this property if you want for instance to bind the local socket to a specific IP address.

Flags: Read / Write / Construct Only

-

Since 2.42

+

Since: 2.42

@@ -2567,7 +2513,7 @@ GProxyResolver if you want to control what proxies get used.

Flags: Read / Write

-

Since 2.42

+

Since: 2.42

@@ -2596,9 +2542,10 @@ 
  “remove-feature-by-type”   GType *

Remove feature objects from the session. (Shortcut for calling soup_session_remove_feature_by_type().)

+

[skip]

Flags: Read / Write

Allowed values: GObject

-

Since 2.24

+

Since: 2.24

@@ -2644,7 +2591,7 @@ accepted, and this property has no effect.

Flags: Read / Write

Default value: TRUE

-

Since 2.30

+

Since: 2.30

@@ -2665,7 +2612,7 @@ compatibility.

Flags: Read / Write

Default value: TRUE

-

Since 2.38

+

Since: 2.38

@@ -2707,7 +2654,7 @@ CA database. If you are using SoupSessionAsync or SoupSessionSync, this property will be NULL by default.

Flags: Read / Write

-

Since 2.38

+

Since: 2.38

@@ -2717,7 +2664,7 @@ GTlsConnections created by the session. (This can be used to provide client-side certificates, for example.)

Flags: Read / Write

-

Since 2.48

+

Since: 2.48

@@ -2743,7 +2690,7 @@ “async-context”.

Flags: Read / Write

Default value: FALSE

-

Since 2.38

+

Since: 2.38

@@ -2880,7 +2827,7 @@

Flags: Run First

-

Since 2.30

+

Since: 2.30

@@ -2948,7 +2895,7 @@

Flags: Run First

-

Since 2.24

+

Since: 2.24

@@ -3040,7 +2987,7 @@

Flags: Run First

-

Since 2.24

+

Since: 2.24

@@ -3080,12 +3027,11 @@

Flags: Run First

-

Since 2.30

+

Since: 2.30

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupSessionSync.html libsoup2.4-2.54.1/docs/reference/html/SoupSessionSync.html --- libsoup2.4-2.52.2/docs/reference/html/SoupSessionSync.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupSessionSync.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupSessionSync +SoupSessionSync: libsoup Reference Manual - + @@ -34,33 +34,6 @@
-

Functions

-
---- - - - - - - - - - - -
-SoupSession * - -soup_session_sync_new () -
-SoupSession * - -soup_session_sync_new_with_options () -
-
-

Types and Values

@@ -95,77 +68,17 @@

Functions

-
-

soup_session_sync_new ()

-
SoupSession *
-soup_session_sync_new (void);
-
-

soup_session_sync_new is deprecated and should not be used in newly-written code.

-

SoupSessionSync is deprecated; use a plain -SoupSession, created with soup_session_new(). See the porting guide.

-
-

Creates an synchronous SoupSession with the default options.

-
-

Returns

-

the new session.

-
-
-
-

soup_session_sync_new_with_options ()

-
SoupSession *
-soup_session_sync_new_with_options (const char *optname1,
-                                    ...);
-
-

soup_session_sync_new_with_options is deprecated and should not be used in newly-written code.

-

SoupSessionSync is deprecated; use a plain -SoupSession, created with soup_session_new_with_options(). See the

-porting guide. -
-

Creates an synchronous SoupSession with the specified options.

-
-

Parameters

-
----- - - - - - - - - - - - - -

optname1

name of first property to set

 

...

value of optname1 -, followed by additional property/value pairs

 
-
-
-

Returns

-

the new session.

-

-
- -

Types and Values

SoupSessionSync

typedef struct _SoupSessionSync SoupSessionSync;
-

-

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupSocket.html libsoup2.4-2.54.1/docs/reference/html/SoupSocket.html --- libsoup2.4-2.52.2/docs/reference/html/SoupSocket.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupSocket.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupSocket +SoupSocket: libsoup Reference Manual - + @@ -448,7 +448,6 @@

Returns

the new socket

-

@@ -576,7 +575,6 @@

Returns

a success or failure code.

-

@@ -608,7 +606,6 @@

Returns

whether or not sock is now listening.

-

@@ -644,7 +641,6 @@

Returns

success or failure

-

@@ -688,7 +684,6 @@

Returns

success or failure

-

@@ -717,7 +712,6 @@

Returns

TRUE if sock has SSL credentials set

-

@@ -769,7 +763,6 @@

Returns

TRUE or FALSE.

-

@@ -860,7 +853,6 @@

Returns

sock 's file descriptor.

-

@@ -942,7 +934,6 @@ SOUP_SOCKET_ERROR on any other error, in which case error will also be set).

-

@@ -1039,7 +1030,6 @@

Returns

as for soup_socket_read()

-

@@ -1118,7 +1108,6 @@ SOUP_SOCKET_EOF or SOUP_SOCKET_ERROR. error will be set if the return value is SOUP_SOCKET_ERROR.)

-

@@ -1127,8 +1116,6 @@

SoupSocket

typedef struct _SoupSocket SoupSocket;
-

-

@@ -1253,7 +1240,7 @@ property. Note that this property's value is only useful if the socket is for a TLS connection, and only reliable after some data has been transferred to or from it.

-

Since 2.34

+

Since: 2.34

@@ -1264,7 +1251,7 @@ property. Note that this property's value is only useful if the socket is for a TLS connection, and only reliable after some data has been transferred to or from it.

-

Since 2.34

+

Since: 2.34

@@ -1281,7 +1268,7 @@

Alias for the “use-thread-context” property. (Use g_main_context_get_thread_default())

-

Since 2.38

+

Since: 2.38

@@ -1442,7 +1429,7 @@

Use g_main_context_get_thread_default().

Flags: Read / Write / Construct Only

Default value: FALSE

-

Since 2.38

+

Since: 2.38

@@ -1521,7 +1508,7 @@

Flags: Run Last

-

Since 2.38

+

Since: 2.38

@@ -1632,7 +1619,6 @@
-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/SoupURI.html libsoup2.4-2.54.1/docs/reference/html/SoupURI.html --- libsoup2.4-2.52.2/docs/reference/html/SoupURI.html 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/SoupURI.html 2016-04-26 12:36:43.000000000 +0000 @@ -2,13 +2,13 @@ -libsoup Reference Manual: SoupURI +SoupURI: libsoup Reference Manual - + @@ -397,7 +397,6 @@

Returns

a parsed SoupURI.

-

@@ -475,7 +474,6 @@

Returns

a string representing uri , which the caller must free.

-

@@ -504,7 +502,6 @@

Returns

a copy of uri , which must be freed with soup_uri_free()

-

@@ -532,9 +529,8 @@

Returns

the new SoupURI

-

-

Since 2.28

+

Since: 2.28

@@ -570,7 +566,6 @@

Returns

TRUE or FALSE

-

@@ -610,9 +605,8 @@

Returns

whether or not the URIs are equal in scheme, host, and port.

-

-

Since 2.28

+

Since: 2.28

@@ -640,9 +634,8 @@

Returns

a hash

-

-

Since 2.28

+

Since: 2.28

@@ -702,7 +695,6 @@

Returns

the encoded URI part

-

@@ -734,7 +726,6 @@

Returns

the decoded URI part.

-

@@ -746,6 +737,8 @@

%-decodes any "unreserved" characters (or characters in unescape_extra ) in part +, and %-encodes any non-ASCII +characters, spaces, and non-printing characters in part .

"Unreserved" characters are those that are not allowed to be used for punctuation according to the URI spec. For example, letters are @@ -785,7 +778,6 @@

Returns

the normalized URI part

-

@@ -815,7 +807,6 @@

Returns

TRUE or FALSE

-

@@ -850,9 +841,8 @@

Returns

TRUE if uri is valid for use.

-

-

Since 2.38

+

Since: 2.38

@@ -881,9 +871,8 @@

Returns

TRUE if uri is a valid "http" or "https" URI.

-

-

Since 2.24

+

Since: 2.24

@@ -946,9 +935,8 @@

Returns

uri 's scheme.

-

-

Since 2.32

+

Since: 2.32

@@ -1008,9 +996,8 @@

Returns

uri 's user.

-

-

Since 2.32

+

Since: 2.32

@@ -1070,9 +1057,8 @@

Returns

uri 's password.

-

-

Since 2.32

+

Since: 2.32

@@ -1139,9 +1125,8 @@

Returns

uri 's host.

-

-

Since 2.32

+

Since: 2.32

@@ -1204,9 +1189,8 @@

Returns

uri 's port.

-

-

Since 2.32

+

Since: 2.32

@@ -1266,9 +1250,8 @@

Returns

uri 's path.

-

-

Since 2.32

+

Since: 2.32

@@ -1403,9 +1386,8 @@

Returns

uri 's query.

-

-

Since 2.32

+

Since: 2.32

@@ -1465,9 +1447,8 @@

Returns

uri 's fragment.

-

-

Since 2.32

+

Since: 2.32

@@ -1631,7 +1612,7 @@

"data" as an interned string; you can compare this directly to a SoupURI's scheme field using ==.

-

Since 2.30

+

Since: 2.30

@@ -1641,7 +1622,7 @@

"file" as an interned string; you can compare this directly to a SoupURI's scheme field using ==.

-

Since 2.30

+

Since: 2.30

@@ -1651,7 +1632,7 @@

"ftp" as an interned string; you can compare this directly to a SoupURI's scheme field using ==.

-

Since 2.30

+

Since: 2.30

@@ -1661,7 +1642,7 @@

"data" as an interned string; you can compare this directly to a SoupURI's scheme field using ==.

-

Since 2.42

+

Since: 2.42

@@ -1671,7 +1652,7 @@

"ws" (WebSocket) as an interned string; you can compare this directly to a SoupURI's scheme field using ==.

-

Since 2.50

+

Since: 2.50

@@ -1681,12 +1662,11 @@

"wss" (WebSocket over TLS) as an interned string; you can compare this directly to a SoupURI's scheme field using ==.

-

Since 2.50

+

Since: 2.50

-
- Generated by GTK-Doc V1.21
+
Generated by GTK-Doc V1.24 \ No newline at end of file diff -Nru libsoup2.4-2.52.2/docs/reference/html/style.css libsoup2.4-2.54.1/docs/reference/html/style.css --- libsoup2.4-2.52.2/docs/reference/html/style.css 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/html/style.css 2016-04-26 12:36:43.000000000 +0000 @@ -60,7 +60,7 @@ div.informaltable table { border-collapse: separate; - border-spacing: 1em 0.5em; + border-spacing: 1em 0.3em; border: none; } @@ -148,6 +148,8 @@ h4 { color: #555753; + margin-top: 1em; + margin-bottom: 1em; } hr @@ -166,17 +168,16 @@ padding-bottom: 0.25em; } -dl.toc > dd > dl > dt +dl.toc > dt { padding-top: 0.25em; padding-bottom: 0.25em; + font-weight: bold; } -dl.toc > dt +dl.toc > dl { - padding-top: 1em; padding-bottom: 0.5em; - font-weight: bold; } .parameter @@ -346,7 +347,9 @@ } @media screen { - sup a.footnote + /* these have a as a first child, but since there are no parent selectors + * we can't use that. */ + a.footnote { position: relative; top: 0em ! important; diff -Nru libsoup2.4-2.52.2/docs/reference/libsoup-2.4-sections.txt libsoup2.4-2.54.1/docs/reference/libsoup-2.4-sections.txt --- libsoup2.4-2.52.2/docs/reference/libsoup-2.4-sections.txt 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/libsoup-2.4-sections.txt 2016-04-26 12:36:43.000000000 +0000 @@ -580,6 +580,8 @@ SOUP_TYPE_AUTH_BASIC SOUP_TYPE_AUTH_DIGEST SOUP_TYPE_AUTH_NTLM +SOUP_TYPE_AUTH_NEGOTIATE +soup_auth_negotiate_supported soup_auth_is_for_proxy soup_auth_get_scheme_name @@ -588,6 +590,7 @@ soup_auth_get_info soup_auth_authenticate +soup_auth_can_authenticate soup_auth_is_authenticated soup_auth_is_ready @@ -612,6 +615,7 @@ soup_auth_basic_get_type soup_auth_digest_get_type soup_auth_ntlm_get_type +soup_auth_negotiate_get_type soup_auth_get_saved_password soup_auth_get_saved_users diff -Nru libsoup2.4-2.52.2/docs/reference/libsoup-2.4.types libsoup2.4-2.54.1/docs/reference/libsoup-2.4.types --- libsoup2.4-2.52.2/docs/reference/libsoup-2.4.types 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/libsoup-2.4.types 2016-04-26 12:36:43.000000000 +0000 @@ -6,6 +6,7 @@ soup_auth_domain_get_type soup_auth_get_type soup_auth_manager_get_type +soup_auth_negotiate_get_type soup_auth_ntlm_get_type soup_buffer_get_type soup_cache_get_type diff -Nru libsoup2.4-2.52.2/docs/reference/Makefile.am libsoup2.4-2.54.1/docs/reference/Makefile.am --- libsoup2.4-2.52.2/docs/reference/Makefile.am 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/Makefile.am 2016-03-14 16:19:35.000000000 +0000 @@ -31,7 +31,7 @@ # Header files to ignore when scanning. IGNORE_HFILES= soup.h soup-autocleanups.h soup-enum-types.h \ soup-message-private.h soup-session-private.h \ - soup-auth-basic.h soup-auth-digest.h soup-auth-ntlm.h \ + soup-auth-basic.h soup-auth-digest.h soup-auth-ntlm.h soup-auth-negotiate.h \ soup-connection.h soup-connection-auth.h \ soup-message-queue.h soup-path-map.h soup-gnome-features.h \ soup-proxy-resolver.h soup-proxy-resolver-gnome.h \ diff -Nru libsoup2.4-2.52.2/docs/reference/Makefile.in libsoup2.4-2.54.1/docs/reference/Makefile.in --- libsoup2.4-2.52.2/docs/reference/Makefile.in 2015-11-09 20:25:05.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,17 @@ # Everything below here is generic # #################################### VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,8 +93,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/gtk-doc.make $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am subdir = docs/reference ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ @@ -96,6 +104,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -120,6 +129,7 @@ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -146,7 +156,6 @@ CPPFLAGS = @CPPFLAGS@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -199,6 +208,9 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -208,6 +220,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -239,6 +252,7 @@ SOUP_API_VERSION = @SOUP_API_VERSION@ SOUP_CURRENT = @SOUP_CURRENT@ SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ @@ -345,7 +359,7 @@ # Header files to ignore when scanning. IGNORE_HFILES = soup.h soup-autocleanups.h soup-enum-types.h \ soup-message-private.h soup-session-private.h \ - soup-auth-basic.h soup-auth-digest.h soup-auth-ntlm.h \ + soup-auth-basic.h soup-auth-digest.h soup-auth-ntlm.h soup-auth-negotiate.h \ soup-connection.h soup-connection-auth.h \ soup-message-queue.h soup-path-map.h soup-gnome-features.h \ soup-proxy-resolver.h soup-proxy-resolver-gnome.h \ @@ -407,6 +421,7 @@ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -415,9 +430,9 @@ $(HTML_IMAGES) \ $(SETUP_FILES) -DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS = setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -450,11 +465,6 @@ GTK_DOC_V_INTROSPECT_ = $(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_INTROSPECT_0 = @echo " DOC Introspecting gobjects"; -#### templates #### -GTK_DOC_V_TMPL = $(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_ = $(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0 = @echo " DOC Rebuilding template files"; - #### xml #### GTK_DOC_V_XML = $(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_ = $(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) @@ -487,7 +497,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign docs/reference/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign docs/reference/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -496,7 +505,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/gtk-doc.make: +$(top_srcdir)/gtk-doc.make $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -669,6 +678,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ uninstall-am uninstall-local +.PRECIOUS: Makefile + gtkdoc-check.test: Makefile $(AM_V_GEN)echo "#!/bin/sh -e" > $@; \ @@ -686,18 +697,15 @@ setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ + destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp @@ -710,7 +718,7 @@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -727,23 +735,8 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -753,17 +746,17 @@ sgml.stamp: sgml-build.stamp @true -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -779,11 +772,11 @@ $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -808,13 +801,15 @@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: @@ -861,9 +856,7 @@ @HAVE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-address.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-address.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-address.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-address.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,273 +0,0 @@ - -SoupAddress - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_ADDRESS_FAMILY_INVALID: -@SOUP_ADDRESS_FAMILY_IPV4: -@SOUP_ADDRESS_FAMILY_IPV6: - - - - - - - - - - - - - -@name: -@port: -@Returns: - - - - - - - -@sa: -@len: -@Returns: - - - - - - - -@family: -@port: -@Returns: - - - - - - - -@addr: -@status: -@user_data: - - - - - - - -@addr: -@async_context: -@cancellable: -@callback: -@user_data: - - - - - - - -@addr: -@cancellable: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - -@addr: -@len: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - -@addr1: -@addr2: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - -@addr1: -@addr2: -@Returns: - - - - - - - -@addr: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-domain-basic.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-domain-basic.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-domain-basic.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-domain-basic.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ - -SoupAuthDomainBasic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@optname1: -@...: -@Returns: - - - - - - - -@domain: -@msg: -@username: -@password: -@user_data: -@Returns: - - - - - - - -@domain: -@callback: -@user_data: -@dnotify: - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-domain-digest.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-domain-digest.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-domain-digest.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-domain-digest.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,98 +0,0 @@ - -SoupAuthDomainDigest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@optname1: -@...: -@Returns: - - - - - - - -@domain: -@msg: -@username: -@user_data: -@Returns: - - - - - - - -@domain: -@callback: -@user_data: -@dnotify: - - - - - - - -@username: -@realm: -@password: -@Returns: - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-domain.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-domain.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-domain.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-domain.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,239 +0,0 @@ - -SoupAuthDomain - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@domain: -@path: - - - - - - - -@domain: -@path: - - - - - - - -@domain: -@msg: -@user_data: -@Returns: - - - - - - - -@domain: -@filter: -@filter_data: -@dnotify: - - - - - - - -@domain: -@Returns: - - - - - - - -@domain: -@msg: -@username: -@user_data: -@Returns: - - - - - - - -@domain: -@auth_callback: -@auth_data: -@dnotify: - - - - - - - -@domain: -@msg: -@username: -@password: -@Returns: - - - - - - - -@domain: -@msg: -@Returns: - - - - - - - -@domain: -@msg: -@Returns: - - - - - - - -@domain: -@msg: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-manager.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-manager.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth-manager.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth-manager.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,57 +0,0 @@ - -SoupAuthManager - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@soupauthmanager: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - - - - - - - - -@manager: -@uri: -@auth: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-auth.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-auth.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,236 +0,0 @@ - -SoupAuth - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@type: -@msg: -@auth_header: -@Returns: - - - - - - - -@auth: -@msg: -@auth_header: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@auth: -@Returns: - - - - - - - -@auth: -@Returns: - - - - - - - -@auth: -@Returns: - - - - - - - -@auth: -@Returns: - - - - - - - -@auth: -@Returns: - - - - - - - -@auth: -@username: -@password: - - - - - - - -@auth: -@Returns: - - - - - - - -@auth: -@msg: -@Returns: - - - - - - - -@auth: -@msg: -@Returns: - - - - - - - -@auth: -@source_uri: -@Returns: - - - - - - - -@auth: -@space: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-cache.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-cache.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-cache.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-cache.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ - -SoupCache - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_CACHE_SINGLE_USER: -@SOUP_CACHE_SHARED: - - - - - - -@cache_dir: -@cache_type: -@Returns: - - - - - - - -@cache: - - - - - - - -@cache: - - - - - - - -@cache: - - - - - - - -@cache: - - - - - - - -@cache: -@Returns: - - - - - - - -@cache: -@max_size: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-content-decoder.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-content-decoder.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-content-decoder.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-content-decoder.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ - -SoupContentDecoder - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-content-sniffer.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-content-sniffer.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-content-sniffer.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-content-sniffer.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ - -SoupContentSniffer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@sniffer: -@msg: -@buffer: -@params: -@Returns: - - - - - - - -@sniffer: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie-jar-db.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie-jar-db.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie-jar-db.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie-jar-db.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ - -SoupCookieJarDB - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@filename: -@read_only: -@Returns: - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie-jar.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie-jar.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie-jar.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie-jar.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ - -SoupCookieJar - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@soupcookiejar: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@jar: -@uri: -@for_http: -@Returns: - - - - - - - -@jar: -@uri: -@for_http: -@Returns: - - - - - - - -@jar: -@uri: -@cookie: - - - - - - - -@jar: -@uri: -@first_party: -@cookie: - - - - - - - -@jar: -@cookie: - - - - - - - -@jar: -@first_party: -@cookie: - - - - - - - -@jar: -@cookie: - - - - - - - -@jar: -@Returns: - - - - - - - -@SOUP_COOKIE_JAR_ACCEPT_ALWAYS: -@SOUP_COOKIE_JAR_ACCEPT_NEVER: -@SOUP_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY: - - - - - - -@jar: -@Returns: - - - - - - - -@jar: -@policy: - - - - - - - -@jar: -@Returns: - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie-jar-text.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie-jar-text.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie-jar-text.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie-jar-text.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ - -SoupCookieJarText - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@filename: -@read_only: -@Returns: - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-cookie.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-cookie.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,324 +0,0 @@ - -SoupCookie - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@name: -@value: -@domain: -@path: -@max_age: -@Returns: - - - - - - - -@header: -@origin: -@Returns: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: - - - - - - - -@cookie: -@name: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@value: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@domain: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@path: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@max_age: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@cookie: -@expires: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@secure: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@http_only: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@uri: -@Returns: - - - - - - - -@cookie: -@host: -@Returns: - - - - - - - -@cookie: -@Returns: - - - - - - - -@cookie: -@Returns: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@Returns: - - - - - - - -@cookies: -@msg: - - - - - - - -@cookies: -@msg: - - - - - - - -@cookies: -@Returns: - - - - - - - -@cookies: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-form.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-form.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-form.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-form.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,142 +0,0 @@ - -HTML Form Support - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@encoded_form: -@Returns: - - - - - - - -@msg: -@file_control_name: -@filename: -@content_type: -@file: -@Returns: - - - - - - - -@first_field: -@...: -@Returns: - - - - - - - -@form_data_set: -@Returns: - - - - - - - -@form_data_set: -@Returns: - - - - - - - -@first_field: -@args: -@Returns: - - - - - - - -@method: -@uri: -@first_field: -@...: -@Returns: - - - - - - - -@method: -@uri: -@form_data_set: -@Returns: - - - - - - - -@method: -@uri: -@form_data_set: -@Returns: - - - - - - - -@uri: -@multipart: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-logger.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-logger.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-logger.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-logger.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,124 +0,0 @@ - -SoupLogger - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_LOGGER_LOG_NONE: -@SOUP_LOGGER_LOG_MINIMAL: -@SOUP_LOGGER_LOG_HEADERS: -@SOUP_LOGGER_LOG_BODY: - - - - - - -@level: -@max_body_size: -@Returns: - - - - - - - -@logger: -@session: - - - - - - - -@logger: -@session: - - - - - - - -@logger: -@msg: -@user_data: -@Returns: - - - - - - - -@logger: -@request_filter: -@filter_data: -@destroy: - - - - - - - -@logger: -@response_filter: -@filter_data: -@destroy: - - - - - - - -@logger: -@level: -@direction: -@data: -@user_data: - - - - - - - -@logger: -@printer: -@printer_data: -@destroy: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-message-body.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-message-body.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-message-body.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-message-body.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,253 +0,0 @@ - -SoupMessageBody - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_MEMORY_STATIC: -@SOUP_MEMORY_TAKE: -@SOUP_MEMORY_COPY: -@SOUP_MEMORY_TEMPORARY: - - - - - - -@use: -@data: -@length: -@Returns: - - - - - - - -@parent: -@offset: -@length: -@Returns: - - - - - - - -@data: -@length: -@owner: -@owner_dnotify: -@Returns: - - - - - - - -@data: -@length: -@Returns: - - - - - - - -@buffer: -@Returns: - - - - - - - -@buffer: -@data: -@length: - - - - - - - -@buffer: -@Returns: - - - - - - - -@buffer: - - - - - - - -@buffer: -@Returns: - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@body: - - - - - - - -@body: -@accumulate: - - - - - - - -@body: -@Returns: - - - - - - - -@body: -@use: -@data: -@length: - - - - - - - -@body: -@buffer: - - - - - - - -@body: -@data: -@length: - - - - - - - -@body: - - - - - - - -@body: - - - - - - - -@body: -@Returns: - - - - - - - -@body: -@offset: -@Returns: - - - - - - - -@body: -@chunk: - - - - - - - -@body: -@chunk: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-message-headers.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-message-headers.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-message-headers.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-message-headers.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,395 +0,0 @@ - -SoupMessageHeaders - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_MESSAGE_HEADERS_REQUEST: -@SOUP_MESSAGE_HEADERS_RESPONSE: -@SOUP_MESSAGE_HEADERS_MULTIPART: - - - - - - -@type: -@Returns: - - - - - - - -@hdrs: - - - - - - - -@hdrs: -@name: -@value: - - - - - - - -@hdrs: -@name: -@value: - - - - - - - -@hdrs: -@name: - - - - - - - -@hdrs: - - - - - - - -@hdrs: - - - - - - - -@hdrs: -@name: -@Returns: - - - - - - - -@hdrs: -@name: -@Returns: - - - - - - - -@hdrs: -@name: -@Returns: - - - - - - - -@hdrs: -@Returns: - - - - - - - -@hdrs: -@name: -@token: -@Returns: - - - - - - - -@hdrs: -@name: -@value: -@Returns: - - - - - - - -@name: -@value: -@user_data: - - - - - - - -@hdrs: -@func: -@user_data: - - - - - - - - - - - - - -@iter: -@hdrs: - - - - - - - -@iter: -@name: -@value: -@Returns: - - - - - - - -@SOUP_ENCODING_UNRECOGNIZED: -@SOUP_ENCODING_NONE: -@SOUP_ENCODING_CONTENT_LENGTH: -@SOUP_ENCODING_EOF: -@SOUP_ENCODING_CHUNKED: -@SOUP_ENCODING_BYTERANGES: - - - - - - -@hdrs: -@Returns: - - - - - - - -@hdrs: -@encoding: - - - - - - - -@hdrs: -@Returns: - - - - - - - -@hdrs: -@content_length: - - - - - - - -@SOUP_EXPECTATION_UNRECOGNIZED: -@SOUP_EXPECTATION_CONTINUE: - - - - - - -@hdrs: -@Returns: - - - - - - - -@hdrs: -@expectations: - - - - - - - -@hdrs: -@params: -@Returns: - - - - - - - -@hdrs: -@content_type: -@params: - - - - - - - -@hdrs: -@disposition: -@params: -@Returns: - - - - - - - -@hdrs: -@disposition: -@params: - - - - - - - -@start: -@end: - - - - - - -@hdrs: -@total_length: -@ranges: -@length: -@Returns: - - - - - - - -@hdrs: -@ranges: -@length: - - - - - - - -@hdrs: -@start: -@end: - - - - - - - -@hdrs: -@ranges: - - - - - - - -@hdrs: -@start: -@end: -@total_length: -@Returns: - - - - - - - -@hdrs: -@start: -@end: -@total_length: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-message.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-message.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-message.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-message.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,636 +0,0 @@ - -SoupMessage - - - - - - - - - - - - - - - - - - - - - - - - - - - -@method: -@status_code: -@reason_phrase: -@request_body: -@request_headers: -@response_body: -@response_headers: - - - - - - -@soupmessage: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. -@arg1: - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. -@arg1: - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. - - - - - - -@soupmessage: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@method: -@uri_string: -@Returns: - - - - - - - -@method: -@uri: -@Returns: - - - - - - - -@msg: -@content_type: -@req_use: -@req_body: -@req_length: - - - - - - - -@msg: -@content_type: -@resp_use: -@resp_body: -@resp_length: - - - - - - - -@SOUP_HTTP_1_0: -@SOUP_HTTP_1_1: - - - - - - -@msg: -@version: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@uri: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@status_code: - - - - - - - -@msg: -@status_code: -@reason_phrase: - - - - - - - -@msg: -@status_code: -@redirect_uri: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@certificate: -@errors: -@Returns: - - - - - - - -@msg: -@first_party: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@signal: -@header: -@callback: -@user_data: -@Returns: - - - - - - - -@msg: -@signal: -@status_code: -@callback: -@user_data: -@Returns: - - - - - - - -@SOUP_MESSAGE_NO_REDIRECT: -@SOUP_MESSAGE_CAN_REBUILD: -@SOUP_MESSAGE_OVERWRITE_CHUNKS: -@SOUP_MESSAGE_CONTENT_DECODED: -@SOUP_MESSAGE_CERTIFICATE_TRUSTED: -@SOUP_MESSAGE_NEW_CONNECTION: -@SOUP_MESSAGE_IDEMPOTENT: -@SOUP_MESSAGE_IGNORE_CONNECTION_LIMITS: - - - - - - -@msg: -@flags: - - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@max_len: -@user_data: -@Returns: - - - - - - - -@msg: -@allocator: -@user_data: -@destroy_notify: - - - - - - - -@msg: -@feature_type: - - - - - - - -@msg: -@Returns: - - - - - - - -@SOUP_MESSAGE_PRIORITY_VERY_LOW: -@SOUP_MESSAGE_PRIORITY_LOW: -@SOUP_MESSAGE_PRIORITY_NORMAL: -@SOUP_MESSAGE_PRIORITY_HIGH: -@SOUP_MESSAGE_PRIORITY_VERY_HIGH: - - - - - - -@msg: -@Returns: - - - - - - - -@msg: -@priority: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-method.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-method.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-method.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-method.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,129 +0,0 @@ - -soup-method - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-misc.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-misc.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-misc.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-misc.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,401 +0,0 @@ - -Soup Miscellaneous Utilities - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_DATE_HTTP: -@SOUP_DATE_COOKIE: -@SOUP_DATE_RFC2822: -@SOUP_DATE_ISO8601_COMPACT: -@SOUP_DATE_ISO8601_FULL: -@SOUP_DATE_ISO8601: -@SOUP_DATE_ISO8601_XMLRPC: - - - - - - -@year: -@month: -@day: -@hour: -@minute: -@second: -@Returns: - - - - - - - -@date_string: -@Returns: - - - - - - - -@when: -@Returns: - - - - - - - -@offset_seconds: -@Returns: - - - - - - - -@date: -@format: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@time: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@date: - - - - - - - -@str: -@len: -@req_headers: -@req_method: -@req_path: -@ver: -@Returns: - - - - - - - -@str: -@len: -@headers: -@ver: -@status_code: -@reason_phrase: -@Returns: - - - - - - - -@status_line: -@ver: -@status_code: -@reason_phrase: -@Returns: - - - - - - - -@str: -@len: -@dest: -@Returns: - - - - - - - -@header: -@Returns: - - - - - - - -@header: -@unacceptable: -@Returns: - - - - - - - -@list: - - - - - - - -@header: -@token: -@Returns: - - - - - - - -@header: -@Returns: - - - - - - - -@header: -@Returns: - - - - - - - -@param_list: - - - - - - - -@string: -@name: -@value: - - - - - - - -@string: -@name: -@value: - - - - - - - -@v1: -@v2: -@Returns: - - - - - - - -@key: -@Returns: - - - - - - - -@async_context: -@function: -@data: -@Returns: - - - - - - - -@async_context: -@function: -@data: -@Returns: - - - - - - - -@async_context: -@chan: -@condition: -@function: -@data: -@Returns: - - - - - - - -@async_context: -@interval: -@function: -@data: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-multipart-input-stream.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-multipart-input-stream.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-multipart-input-stream.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-multipart-input-stream.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ - -SoupMultipartInputStream - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@msg: -@base_stream: -@Returns: - - - - - - - -@multipart: -@Returns: - - - - - - - -@multipart: -@cancellable: -@error: -@Returns: - - - - - - - -@multipart: -@io_priority: -@cancellable: -@callback: -@data: - - - - - - - -@multipart: -@result: -@error: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-multipart.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-multipart.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-multipart.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-multipart.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,120 +0,0 @@ - -SoupMultipart - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@mime_type: -@Returns: - - - - - - - -@headers: -@body: -@Returns: - - - - - - - -@multipart: - - - - - - - -@multipart: -@Returns: - - - - - - - -@multipart: -@part: -@headers: -@body: -@Returns: - - - - - - - -@multipart: -@headers: -@body: - - - - - - - -@multipart: -@control_name: -@data: - - - - - - - -@multipart: -@control_name: -@filename: -@content_type: -@body: - - - - - - - -@multipart: -@dest_headers: -@dest_body: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-proxy-resolver-default.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-proxy-resolver-default.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-proxy-resolver-default.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-proxy-resolver-default.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ - -SoupProxyResolverDefault - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-request-data.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-request-data.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-request-data.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-request-data.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ - -SoupRequestData - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-request-file.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-request-file.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-request-file.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-request-file.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ - -SoupRequestFile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@file: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-request-http.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-request-http.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-request-http.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-request-http.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ - -SoupRequestHTTP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@http: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-request.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-request.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-request.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-request.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ - -SoupRequest - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@request: -@cancellable: -@error: -@Returns: - - - - - - - -@request: -@cancellable: -@callback: -@user_data: - - - - - - - -@request: -@result: -@error: -@Returns: - - - - - - - -@request: -@Returns: - - - - - - - -@request: -@Returns: - - - - - - - -@request: -@Returns: - - - - - - - -@request: -@Returns: - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-server-deprecated.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-server-deprecated.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-server-deprecated.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-server-deprecated.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,128 +0,0 @@ - -SoupServer deprecated API - - - - - - - - - - - - - - - - - - - - - - - - - - - -@server: -@Returns: - - - - - - - -@server: -@Returns: - - - - - - - -@server: - - - - - - - -@server: - - - - - - - -@server: - - - - - - - -@server: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-server.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-server.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-server.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-server.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,467 +0,0 @@ - -SoupServer - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@soupserver: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupserver: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupserver: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupserver: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@optname1: -@...: -@Returns: - - - - - - - -@server: -@ssl_cert_file: -@ssl_key_file: -@error: -@Returns: - - - - - - - -@SOUP_SERVER_LISTEN_HTTPS: -@SOUP_SERVER_LISTEN_IPV4_ONLY: -@SOUP_SERVER_LISTEN_IPV6_ONLY: - - - - - - -@server: -@address: -@options: -@error: -@Returns: - - - - - - - -@server: -@port: -@options: -@error: -@Returns: - - - - - - - -@server: -@port: -@options: -@error: -@Returns: - - - - - - - -@server: -@socket: -@options: -@error: -@Returns: - - - - - - - -@server: -@fd: -@options: -@error: -@Returns: - - - - - - - -@server: -@Returns: - - - - - - - -@server: -@Returns: - - - - - - - -@server: - - - - - - - -@server: -@Returns: - - - - - - - -@server: -@stream: -@local_addr: -@remote_addr: -@error: -@Returns: - - - - - - - -@server: -@msg: -@path: -@query: -@client: -@user_data: - - - - - - - -@server: -@path: -@callback: -@user_data: -@destroy: - - - - - - - -@server: -@path: -@callback: -@user_data: -@destroy: - - - - - - - -@server: -@path: - - - - - - - -@server: -@connection: -@path: -@client: -@user_data: - - - - - - - -@server: -@path: -@origin: -@protocols: -@callback: -@user_data: -@destroy: - - - - - - - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@client: -@Returns: - - - - - - - -@server: -@auth_domain: - - - - - - - -@server: -@auth_domain: - - - - - - - -@server: -@msg: - - - - - - - -@server: -@msg: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-session-async.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-session-async.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-session-async.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-session-async.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ - -SoupSessionAsync - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@optname1: -@...: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-session-feature.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-session-feature.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-session-feature.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-session-feature.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ - -SoupSessionFeature - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@parent: -@attach: -@detach: -@request_queued: -@request_started: -@request_unqueued: -@add_feature: -@remove_feature: -@has_feature: - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-session.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-session.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-session.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-session.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,705 +0,0 @@ - -SoupSession - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@soupsession: the object which received the signal. -@arg1: -@arg2: -@arg3: - - - - - - -@soupsession: the object which received the signal. -@arg1: - - - - - - -@soupsession: the object which received the signal. -@arg1: - - - - - - -@soupsession: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupsession: the object which received the signal. -@arg1: - - - - - - -@soupsession: the object which received the signal. -@arg1: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@optname1: -@...: -@Returns: - - - - - - - -@session: -@uri_string: -@error: -@Returns: - - - - - - - -@session: -@uri: -@error: -@Returns: - - - - - - - -@session: -@method: -@uri_string: -@error: -@Returns: - - - - - - - -@session: -@method: -@uri: -@error: -@Returns: - - - - - - - -@SOUP_REQUEST_ERROR_BAD_URI: -@SOUP_REQUEST_ERROR_UNSUPPORTED_URI_SCHEME: -@SOUP_REQUEST_ERROR_PARSING: -@SOUP_REQUEST_ERROR_ENCODING: - - - - - - - - - - - - - -@session: -@msg: -@user_data: - - - - - - - -@session: -@msg: -@callback: -@user_data: - - - - - - - -@session: -@msg: - - - - - - - -@session: -@msg: -@Returns: - - - - - - - -@session: -@msg: -@status_code: - - - - - - - -@session: -@msg: -@cancellable: -@error: -@Returns: - - - - - - - -@session: -@msg: -@cancellable: -@callback: -@user_data: - - - - - - - -@session: -@result: -@error: -@Returns: - - - - - - - -@session: -@msg: -@origin: -@protocols: -@cancellable: -@callback: -@user_data: - - - - - - - -@session: -@result: -@error: -@Returns: - - - - - - - -@session: -@hostname: -@cancellable: -@callback: -@user_data: - - - - - - - -@session: -@uri: - - - - - - - -@session: - - - - - - - -@session: -@msg: -@Returns: - - - - - - - -@session: -@msg: -@Returns: - - - - - - - -@session: -@msg: - - - - - - - -@session: -@msg: - - - - - - - -@session: -@Returns: - - - - - - - -@session: -@feature: - - - - - - - -@session: -@feature_type: - - - - - - - -@session: -@feature: - - - - - - - -@session: -@feature_type: - - - - - - - -@session: -@feature_type: -@Returns: - - - - - - - -@session: -@feature_type: -@Returns: - - - - - - - -@session: -@feature_type: -@msg: -@Returns: - - - - - - - -@session: -@feature_type: -@Returns: - - - - - - - -@session: -@msg: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-session-sync.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-session-sync.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-session-sync.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-session-sync.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ - -SoupSessionSync - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@optname1: -@...: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-socket.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-socket.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-socket.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-socket.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,428 +0,0 @@ - -SoupSocket - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@soupsocket: the object which received the signal. - - - - - - -@soupsocket: the object which received the signal. -@arg1: -@arg2: - - - - - - -@soupsocket: the object which received the signal. -@arg1: - - - - - - -@soupsocket: the object which received the signal. - - - - - - -@soupsocket: the object which received the signal. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@optname1: -@...: -@Returns: - - - - - - - -@sock: -@status: -@user_data: - - - - - - - -@sock: -@cancellable: -@callback: -@user_data: - - - - - - - -@sock: -@cancellable: -@Returns: - - - - - - - -@sock: -@Returns: - - - - - - - -@sock: -@cancellable: -@Returns: - - - - - - - -@sock: -@ssl_host: -@cancellable: -@Returns: - - - - - - - -@sock: -@Returns: - - - - - - - -@sock: - - - - - - - -@sock: -@Returns: - - - - - - - -@sock: -@Returns: - - - - - - - -@sock: -@Returns: - - - - - - - -@sock: -@Returns: - - - - - - - -@SOUP_SOCKET_OK: -@SOUP_SOCKET_WOULD_BLOCK: -@SOUP_SOCKET_EOF: -@SOUP_SOCKET_ERROR: - - - - - - -@sock: -@buffer: -@len: -@nread: -@cancellable: -@error: -@Returns: - - - - - - - -@sock: -@buffer: -@len: -@boundary: -@boundary_len: -@nread: -@got_boundary: -@cancellable: -@error: -@Returns: - - - - - - - -@sock: -@buffer: -@len: -@nwrote: -@cancellable: -@error: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-status.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-status.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-status.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-status.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ - -soup-status - - - - - - - - - - - - - - - - - - - - - - - - - - - -@status: - - - - - - - -@status: - - - - - - - -@status: - - - - - - - -@status: - - - - - - - -@status: - - - - - - - -@status: - - - - - - - -@SOUP_STATUS_NONE: -@SOUP_STATUS_CANCELLED: -@SOUP_STATUS_CANT_RESOLVE: -@SOUP_STATUS_CANT_RESOLVE_PROXY: -@SOUP_STATUS_CANT_CONNECT: -@SOUP_STATUS_CANT_CONNECT_PROXY: -@SOUP_STATUS_SSL_FAILED: -@SOUP_STATUS_IO_ERROR: -@SOUP_STATUS_MALFORMED: -@SOUP_STATUS_TRY_AGAIN: -@SOUP_STATUS_TOO_MANY_REDIRECTS: -@SOUP_STATUS_TLS_FAILED: -@SOUP_STATUS_CONTINUE: -@SOUP_STATUS_SWITCHING_PROTOCOLS: -@SOUP_STATUS_PROCESSING: -@SOUP_STATUS_OK: -@SOUP_STATUS_CREATED: -@SOUP_STATUS_ACCEPTED: -@SOUP_STATUS_NON_AUTHORITATIVE: -@SOUP_STATUS_NO_CONTENT: -@SOUP_STATUS_RESET_CONTENT: -@SOUP_STATUS_PARTIAL_CONTENT: -@SOUP_STATUS_MULTI_STATUS: -@SOUP_STATUS_MULTIPLE_CHOICES: -@SOUP_STATUS_MOVED_PERMANENTLY: -@SOUP_STATUS_FOUND: -@SOUP_STATUS_MOVED_TEMPORARILY: -@SOUP_STATUS_SEE_OTHER: -@SOUP_STATUS_NOT_MODIFIED: -@SOUP_STATUS_USE_PROXY: -@SOUP_STATUS_NOT_APPEARING_IN_THIS_PROTOCOL: -@SOUP_STATUS_TEMPORARY_REDIRECT: -@SOUP_STATUS_BAD_REQUEST: -@SOUP_STATUS_UNAUTHORIZED: -@SOUP_STATUS_PAYMENT_REQUIRED: -@SOUP_STATUS_FORBIDDEN: -@SOUP_STATUS_NOT_FOUND: -@SOUP_STATUS_METHOD_NOT_ALLOWED: -@SOUP_STATUS_NOT_ACCEPTABLE: -@SOUP_STATUS_PROXY_AUTHENTICATION_REQUIRED: -@SOUP_STATUS_PROXY_UNAUTHORIZED: -@SOUP_STATUS_REQUEST_TIMEOUT: -@SOUP_STATUS_CONFLICT: -@SOUP_STATUS_GONE: -@SOUP_STATUS_LENGTH_REQUIRED: -@SOUP_STATUS_PRECONDITION_FAILED: -@SOUP_STATUS_REQUEST_ENTITY_TOO_LARGE: -@SOUP_STATUS_REQUEST_URI_TOO_LONG: -@SOUP_STATUS_UNSUPPORTED_MEDIA_TYPE: -@SOUP_STATUS_REQUESTED_RANGE_NOT_SATISFIABLE: -@SOUP_STATUS_INVALID_RANGE: -@SOUP_STATUS_EXPECTATION_FAILED: -@SOUP_STATUS_UNPROCESSABLE_ENTITY: -@SOUP_STATUS_LOCKED: -@SOUP_STATUS_FAILED_DEPENDENCY: -@SOUP_STATUS_INTERNAL_SERVER_ERROR: -@SOUP_STATUS_NOT_IMPLEMENTED: -@SOUP_STATUS_BAD_GATEWAY: -@SOUP_STATUS_SERVICE_UNAVAILABLE: -@SOUP_STATUS_GATEWAY_TIMEOUT: -@SOUP_STATUS_HTTP_VERSION_NOT_SUPPORTED: -@SOUP_STATUS_INSUFFICIENT_STORAGE: -@SOUP_STATUS_NOT_EXTENDED: - - - - - - -@status_code: -@Returns: - - - - - - - -@status_code: -@Returns: - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-tld.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-tld.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-tld.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-tld.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ - -Top Level Domain utils - - - - - - - - - - - - - - - - - - - - - - - - - - - -@hostname: -@error: -@Returns: - - - - - - - -@domain: -@Returns: - - - - - - - - - - - - - - -@SOUP_TLD_ERROR_INVALID_HOSTNAME: -@SOUP_TLD_ERROR_IS_IP_ADDRESS: -@SOUP_TLD_ERROR_NOT_ENOUGH_DOMAINS: -@SOUP_TLD_ERROR_NO_BASE_DOMAIN: - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-uri.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-uri.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-uri.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-uri.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,387 +0,0 @@ - -SoupURI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@base: -@uri_string: -@Returns: - - - - - - - -@uri_string: -@Returns: - - - - - - - -@uri: -@just_path_and_query: -@Returns: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri1: -@uri2: -@Returns: - - - - - - - -@v1: -@v2: -@Returns: - - - - - - - -@key: -@Returns: - - - - - - - -@uri: - - - - - - - -@part: -@escape_extra: -@Returns: - - - - - - - -@part: -@Returns: - - - - - - - -@part: -@unescape_extra: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: - - - - - - - -@uri: - - - - - - - -@uri: -@scheme: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@user: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@password: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@host: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@port: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@path: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@query: - - - - - - - -@uri: -@form: - - - - - - - -@uri: -@first_field: -@...: - - - - - - - -@uri: -@Returns: - - - - - - - -@uri: -@fragment: - - - - - - - -@uri: -@Returns: - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-version.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-version.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-version.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-version.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,212 +0,0 @@ - -Version Information - - - - - - - - - - - - - - - - - - - - - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@void: -@Returns: - - - - - - - -@major: -@minor: -@micro: -@Returns: - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@major: -@minor: -@micro: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-websocket.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-websocket.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-websocket.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-websocket.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,309 +0,0 @@ - -WebSockets - - - - - - - - - - - - - - - - - - - - - - - - - - - -@msg: -@origin: -@protocols: - - - - - - - -@msg: -@error: -@Returns: - - - - - - - -@msg: -@origin: -@protocols: -@error: -@Returns: - - - - - - - -@msg: -@expected_origin: -@protocols: -@Returns: - - - - - - - - - - - - - -@soupwebsocketconnection: the object which received the signal. - - - - - - -@soupwebsocketconnection: the object which received the signal. - - - - - - -@soupwebsocketconnection: the object which received the signal. -@arg1: - - - - - - -@soupwebsocketconnection: the object which received the signal. -@arg1: -@arg2: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_WEBSOCKET_CONNECTION_UNKNOWN: -@SOUP_WEBSOCKET_CONNECTION_CLIENT: -@SOUP_WEBSOCKET_CONNECTION_SERVER: - - - - - - -@stream: -@uri: -@type: -@origin: -@protocol: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@SOUP_WEBSOCKET_STATE_OPEN: -@SOUP_WEBSOCKET_STATE_CLOSING: -@SOUP_WEBSOCKET_STATE_CLOSED: - - - - - - -@self: -@Returns: - - - - - - - -@SOUP_WEBSOCKET_DATA_TEXT: -@SOUP_WEBSOCKET_DATA_BINARY: - - - - - - -@self: -@text: - - - - - - - -@self: -@data: -@length: - - - - - - - -@SOUP_WEBSOCKET_CLOSE_NORMAL: -@SOUP_WEBSOCKET_CLOSE_GOING_AWAY: -@SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR: -@SOUP_WEBSOCKET_CLOSE_UNSUPPORTED_DATA: -@SOUP_WEBSOCKET_CLOSE_NO_STATUS: -@SOUP_WEBSOCKET_CLOSE_ABNORMAL: -@SOUP_WEBSOCKET_CLOSE_BAD_DATA: -@SOUP_WEBSOCKET_CLOSE_POLICY_VIOLATION: -@SOUP_WEBSOCKET_CLOSE_TOO_BIG: -@SOUP_WEBSOCKET_CLOSE_NO_EXTENSION: -@SOUP_WEBSOCKET_CLOSE_SERVER_ERROR: -@SOUP_WEBSOCKET_CLOSE_TLS_HANDSHAKE: - - - - - - -@self: -@code: -@data: - - - - - - - -@self: -@Returns: - - - - - - - -@self: -@Returns: - - - - - - - -@SOUP_WEBSOCKET_ERROR_FAILED: -@SOUP_WEBSOCKET_ERROR_NOT_WEBSOCKET: -@SOUP_WEBSOCKET_ERROR_BAD_HANDSHAKE: -@SOUP_WEBSOCKET_ERROR_BAD_ORIGIN: - - - - - - - - diff -Nru libsoup2.4-2.52.2/docs/reference/tmpl/soup-xmlrpc.sgml libsoup2.4-2.54.1/docs/reference/tmpl/soup-xmlrpc.sgml --- libsoup2.4-2.52.2/docs/reference/tmpl/soup-xmlrpc.sgml 2015-11-09 20:25:29.000000000 +0000 +++ libsoup2.4-2.54.1/docs/reference/tmpl/soup-xmlrpc.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,196 +0,0 @@ - -XMLRPC Support - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -@SOUP_XMLRPC_ERROR_ARGUMENTS: -@SOUP_XMLRPC_ERROR_RETVAL: - - - - - - - - - - - - - -@SOUP_XMLRPC_FAULT_PARSE_ERROR_NOT_WELL_FORMED: -@SOUP_XMLRPC_FAULT_PARSE_ERROR_UNSUPPORTED_ENCODING: -@SOUP_XMLRPC_FAULT_PARSE_ERROR_INVALID_CHARACTER_FOR_ENCODING: -@SOUP_XMLRPC_FAULT_SERVER_ERROR_INVALID_XML_RPC: -@SOUP_XMLRPC_FAULT_SERVER_ERROR_REQUESTED_METHOD_NOT_FOUND: -@SOUP_XMLRPC_FAULT_SERVER_ERROR_INVALID_METHOD_PARAMETERS: -@SOUP_XMLRPC_FAULT_SERVER_ERROR_INTERNAL_XML_RPC_ERROR: -@SOUP_XMLRPC_FAULT_APPLICATION_ERROR: -@SOUP_XMLRPC_FAULT_SYSTEM_ERROR: -@SOUP_XMLRPC_FAULT_TRANSPORT_ERROR: - - - - - - -@method_name: -@params: -@error: -@Returns: - - - - - - - -@uri: -@method_name: -@params: -@error: -@Returns: - - - - - - - -@method_response: -@length: -@signature: -@error: -@Returns: - - - - - - - -@date: -@Returns: - - - - - - - -@variant: -@error: -@Returns: - - - - - - - - - - - - - -@self: - - - - - - - -@self: -@signature: -@error: -@Returns: - - - - - - - -@method_call: -@length: -@params: -@error: -@Returns: - - - - - - - -@value: -@error: -@Returns: - - - - - - - -@fault_code: -@fault_format: -@...: -@Returns: - - - - - - - -@msg: -@value: -@error: -@Returns: - - - - - - - -@msg: -@fault_code: -@fault_format: -@...: - - diff -Nru libsoup2.4-2.52.2/examples/get.c libsoup2.4-2.54.1/examples/get.c --- libsoup2.4-2.52.2/examples/get.c 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/examples/get.c 2016-03-14 16:19:35.000000000 +0000 @@ -4,6 +4,10 @@ * Copyright (C) 2013 Igalia, S.L. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include @@ -90,6 +94,7 @@ static const char *ca_file, *proxy; static gboolean synchronous, ntlm; +static gboolean negotiate; static GOptionEntry entries[] = { { "ca-file", 'c', 0, @@ -119,6 +124,13 @@ { NULL } }; +static GOptionEntry negotiate_entries[] = { + { "negotiate", 'N', 0, + G_OPTION_ARG_NONE, &negotiate, + "Use Negotiate authentication", NULL }, + { NULL } +}; + int main (int argc, char **argv) { @@ -130,6 +142,8 @@ opts = g_option_context_new (NULL); g_option_context_add_main_entries (opts, entries, NULL); + if (soup_auth_negotiate_supported()) + g_option_context_add_main_entries (opts, negotiate_entries, NULL); if (!g_option_context_parse (opts, &argc, &argv, &error)) { g_printerr ("Could not parse arguments: %s\n", error->message); @@ -183,6 +197,13 @@ soup_uri_free (proxy_uri); } +#ifdef LIBSOUP_HAVE_GSSAPI + if (negotiate) { + soup_session_add_feature_by_type (session, + SOUP_TYPE_AUTH_NEGOTIATE); + } +#endif /* LIBSOUP_HAVE_GSSAPI */ + if (!synchronous) loop = g_main_loop_new (NULL, TRUE); diff -Nru libsoup2.4-2.52.2/examples/Makefile.in libsoup2.4-2.54.1/examples/Makefile.in --- libsoup2.4-2.52.2/examples/Makefile.in 2015-11-09 20:25:05.000000000 +0000 +++ libsoup2.4-2.54.1/examples/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,8 +91,6 @@ noinst_PROGRAMS = get$(EXEEXT) simple-httpd$(EXEEXT) \ simple-proxy$(EXEEXT) subdir = examples -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ @@ -93,6 +101,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -171,6 +180,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -197,7 +208,6 @@ CPPFLAGS = @CPPFLAGS@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -250,6 +260,9 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -262,6 +275,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -293,6 +307,7 @@ SOUP_API_VERSION = @SOUP_API_VERSION@ SOUP_CURRENT = @SOUP_CURRENT@ SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ @@ -389,7 +404,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign examples/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign examples/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -669,6 +683,8 @@ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libsoup2.4-2.52.2/examples/simple-httpd.c libsoup2.4-2.54.1/examples/simple-httpd.c --- libsoup2.4-2.52.2/examples/simple-httpd.c 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/examples/simple-httpd.c 2016-03-21 21:51:16.000000000 +0000 @@ -3,7 +3,6 @@ * Copyright (C) 2001-2003, Ximian, Inc. */ -#include #include #include #include @@ -11,6 +10,7 @@ #include #include +#include static int compare_strings (gconstpointer a, gconstpointer b) @@ -27,22 +27,22 @@ GPtrArray *entries; GString *listing; char *escaped; - DIR *dir; - struct dirent *dent; + GDir *dir; + const gchar *d_name; int i; entries = g_ptr_array_new (); - dir = opendir (path); + dir = g_dir_open (path, 0, NULL); if (dir) { - while ((dent = readdir (dir))) { - if (!strcmp (dent->d_name, ".") || - (!strcmp (dent->d_name, "..") && + while ((d_name = g_dir_read_name (dir))) { + if (!strcmp (d_name, ".") || + (!strcmp (d_name, "..") && !strcmp (path, "./"))) continue; - escaped = g_markup_escape_text (dent->d_name, -1); + escaped = g_markup_escape_text (d_name, -1); g_ptr_array_add (entries, escaped); } - closedir (dir); + g_dir_close (dir); } g_ptr_array_sort (entries, (GCompareFunc)compare_strings); @@ -68,9 +68,9 @@ do_get (SoupServer *server, SoupMessage *msg, const char *path) { char *slash; - struct stat st; + GStatBuf st; - if (stat (path, &st) == -1) { + if (g_stat (path, &st) == -1) { if (errno == EPERM) soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN); else if (errno == ENOENT) @@ -80,7 +80,7 @@ return; } - if (S_ISDIR (st.st_mode)) { + if (g_file_test (path, G_FILE_TEST_IS_DIR)) { GString *listing; char *index_path; @@ -96,7 +96,7 @@ } index_path = g_strdup_printf ("%s/index.html", path); - if (stat (index_path, &st) != -1) { + if (g_stat (path, &st) != -1) { do_get (server, msg, index_path); g_free (index_path); return; @@ -146,18 +146,18 @@ static void do_put (SoupServer *server, SoupMessage *msg, const char *path) { - struct stat st; + GStatBuf st; FILE *f; gboolean created = TRUE; - if (stat (path, &st) != -1) { + if (g_stat (path, &st) != -1) { const char *match = soup_message_headers_get_one (msg->request_headers, "If-None-Match"); if (match && !strcmp (match, "*")) { soup_message_set_status (msg, SOUP_STATUS_CONFLICT); return; } - if (!S_ISREG (st.st_mode)) { + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { soup_message_set_status (msg, SOUP_STATUS_FORBIDDEN); return; } diff -Nru libsoup2.4-2.52.2/examples/simple-proxy.c libsoup2.4-2.54.1/examples/simple-proxy.c --- libsoup2.4-2.52.2/examples/simple-proxy.c 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/examples/simple-proxy.c 2016-02-19 14:15:46.000000000 +0000 @@ -405,7 +405,7 @@ } g_slist_free (uris); - session = soup_session_async_new (); + session = soup_session_new (); g_print ("\nWaiting for requests...\n"); diff -Nru libsoup2.4-2.52.2/gtk-doc.make libsoup2.4-2.54.1/gtk-doc.make --- libsoup2.4-2.52.2/gtk-doc.make 2014-02-14 08:29:12.000000000 +0000 +++ libsoup2.4-2.54.1/gtk-doc.make 2015-05-15 10:02:35.000000000 +0000 @@ -25,6 +25,7 @@ SETUP_FILES = \ $(content_files) \ + $(expand_content_files) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE)-sections.txt \ $(DOC_MODULE)-overrides.txt @@ -33,9 +34,9 @@ $(HTML_IMAGES) \ $(SETUP_FILES) -DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \ +DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \ html-build.stamp pdf-build.stamp \ - tmpl.stamp sgml.stamp html.stamp pdf.stamp + sgml.stamp html.stamp pdf.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -86,21 +87,19 @@ setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ if test "x$$files" != "x" ; then \ for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file` ;\ + destdir=`dirname $(abs_builddir)/$$file`; \ test -d "$$destdir" || mkdir -p "$$destdir"; \ test -f $(abs_srcdir)/$$file && \ cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ done; \ fi; \ - test -d $(abs_srcdir)/tmpl && \ - { cp -pR $(abs_srcdir)/tmpl $(abs_builddir)/; \ - chmod -R u+w $(abs_builddir)/tmpl; } \ fi $(AM_V_at)touch setup-build.stamp + #### scan #### GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) @@ -120,7 +119,7 @@ $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ scanobj_options=""; \ gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ scanobj_options="--verbose"; \ fi; \ @@ -137,35 +136,14 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true -#### templates #### - -GTK_DOC_V_TMPL=$(GTK_DOC_V_TMPL_$(V)) -GTK_DOC_V_TMPL_=$(GTK_DOC_V_TMPL_$(AM_DEFAULT_VERBOSITY)) -GTK_DOC_V_TMPL_0=@echo " DOC Rebuilding template files"; - -tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - $(GTK_DOC_V_TMPL)gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - $(AM_V_at)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - if test -w $(abs_srcdir) ; then \ - cp -pR $(abs_builddir)/tmpl $(abs_srcdir)/; \ - fi \ - fi - $(AM_V_at)touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -$(srcdir)/tmpl/*.sgml: - @true - #### xml #### GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XML_0=@echo " DOC Building XML"; -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - -$(GTK_DOC_V_XML)chmod -R u+w $(srcdir) && _source_dir='' ; \ +sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) + $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ @@ -185,17 +163,17 @@ GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_HTML)rm -rf html && mkdir html && \ mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkhtml_options="$$mkhtml_options --verbose"; \ fi; \ fi; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ mkhtml_options="$$mkhtml_options --path=\"$(abs_srcdir)\""; \ fi; \ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @@ -217,11 +195,11 @@ GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) +pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) $(GTK_DOC_V_PDF)rm -f $(DOC_MODULE).pdf && \ mkpdf_options=""; \ gtkdoc-mkpdf 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$(?)" = "0"; then \ + if test "$$?" = "0"; then \ if test "x$(V)" = "x1"; then \ mkpdf_options="$$mkpdf_options --verbose"; \ fi; \ @@ -246,13 +224,15 @@ @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-types" ; then \ rm -f $(DOC_MODULE).types; \ fi + @if echo $(SCAN_OPTIONS) | grep -q "\-\-rebuild-sections" ; then \ + rm -f $(DOC_MODULE)-sections.txt; \ + fi distclean-local: @rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \ - rm -rf tmpl; \ + rm -f $(SETUP_FILES) $(DOC_MODULE).types; \ fi maintainer-clean-local: @@ -302,9 +282,7 @@ endif dist-hook: dist-check-gtkdoc all-gtk-doc dist-hook-local - @mkdir $(distdir)/tmpl @mkdir $(distdir)/html - @-cp ./tmpl/*.sgml $(distdir)/tmpl @cp ./html/* $(distdir)/html @-cp ./$(DOC_MODULE).pdf $(distdir)/ @-cp ./$(DOC_MODULE).types $(distdir)/ diff -Nru libsoup2.4-2.52.2/libsoup/gconstructor.h libsoup2.4-2.54.1/libsoup/gconstructor.h --- libsoup2.4-2.52.2/libsoup/gconstructor.h 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/gconstructor.h 2016-02-19 14:15:46.000000000 +0000 @@ -30,17 +30,43 @@ #define G_HAS_CONSTRUCTORS 1 -#define G_DEFINE_CONSTRUCTOR(_func) \ +/* We do some weird things to avoid the constructors being optimized + * away on VS2015 if WholeProgramOptimization is enabled. First we + * make a reference to the array from the wrapper to make sure its + * references. Then we use a pragma to make sure the wrapper function + * symbol is always included at the link stage. Also, the symbols + * need to be extern (but not dllexport), even though they are not + * really used from another object file. + */ + +/* We need to account for differences between the mangling of symbols + * for Win32 (x86) and x64 programs, as symbols on Win32 are prefixed + * with an underscore but symbols on x64 are not. + */ +#ifdef _WIN64 +#define G_MSVC_SYMBOL_PREFIX "" +#else +#define G_MSVC_SYMBOL_PREFIX "_" +#endif + +#define G_DEFINE_CONSTRUCTOR(_func) G_MSVC_CTOR (_func, G_MSVC_SYMBOL_PREFIX) +#define G_DEFINE_DESTRUCTOR(_func) G_MSVC_DTOR (_func, G_MSVC_SYMBOL_PREFIX) + +#define G_MSVC_CTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _wrapper(void) { _func(); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _wrapper(void) { _func(); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_wrapper")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _wrapper; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _wrapper; -#define G_DEFINE_DESTRUCTOR(_func) \ +#define G_MSVC_DTOR(_func,_sym_prefix) \ static void _func(void); \ - static int _func ## _constructor(void) { atexit (_func); return 0; } \ + extern int (* _array ## _func)(void); \ + int _func ## _constructor(void) { atexit (_func); g_slist_find (NULL, _array ## _func); return 0; } \ + __pragma(comment(linker,"/include:" _sym_prefix # _func "_constructor")) \ __pragma(section(".CRT$XCU",read)) \ - __declspec(allocate(".CRT$XCU")) static int (* _array ## _func)(void) = _func ## _constructor; + __declspec(allocate(".CRT$XCU")) int (* _array ## _func)(void) = _func ## _constructor; #elif defined (_MSC_VER) diff -Nru libsoup2.4-2.52.2/libsoup/libsoup-2.4.sym libsoup2.4-2.54.1/libsoup/libsoup-2.4.sym --- libsoup2.4-2.52.2/libsoup/libsoup-2.4.sym 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/libsoup-2.4.sym 1970-01-01 00:00:00.000000000 +0000 @@ -1,567 +0,0 @@ -_SOUP_METHOD_CONNECT -_SOUP_METHOD_COPY -_SOUP_METHOD_DELETE -_SOUP_METHOD_GET -_SOUP_METHOD_HEAD -_SOUP_METHOD_LOCK -_SOUP_METHOD_MKCOL -_SOUP_METHOD_MOVE -_SOUP_METHOD_OPTIONS -_SOUP_METHOD_POST -_SOUP_METHOD_PROPFIND -_SOUP_METHOD_PROPPATCH -_SOUP_METHOD_PUT -_SOUP_METHOD_TRACE -_SOUP_METHOD_UNLOCK -_SOUP_URI_SCHEME_DATA -_SOUP_URI_SCHEME_FILE -_SOUP_URI_SCHEME_FTP -_SOUP_URI_SCHEME_HTTP -_SOUP_URI_SCHEME_HTTPS -_SOUP_URI_SCHEME_RESOURCE -_SOUP_URI_SCHEME_WS -_SOUP_URI_SCHEME_WSS -soup_add_completion -soup_add_idle -soup_add_io_watch -soup_add_timeout -soup_address_equal_by_ip -soup_address_equal_by_name -soup_address_family_get_type -soup_address_get_gsockaddr -soup_address_get_name -soup_address_get_physical -soup_address_get_port -soup_address_get_sockaddr -soup_address_get_type -soup_address_hash_by_ip -soup_address_hash_by_name -soup_address_is_resolved -soup_address_new -soup_address_new_any -soup_address_new_from_sockaddr -soup_address_resolve_async -soup_address_resolve_sync -soup_auth_authenticate -soup_auth_basic_get_type -soup_auth_digest_get_type -soup_auth_domain_accepts -soup_auth_domain_add_path -soup_auth_domain_basic_get_type -soup_auth_domain_basic_new -soup_auth_domain_basic_set_auth_callback -soup_auth_domain_challenge -soup_auth_domain_check_password -soup_auth_domain_covers -soup_auth_domain_digest_encode_password -soup_auth_domain_digest_get_type -soup_auth_domain_digest_new -soup_auth_domain_digest_set_auth_callback -soup_auth_domain_get_realm -soup_auth_domain_get_type -soup_auth_domain_remove_path -soup_auth_domain_set_filter -soup_auth_domain_set_generic_auth_callback -soup_auth_domain_try_generic_auth_callback -soup_auth_free_protection_space -soup_auth_get_authorization -soup_auth_get_host -soup_auth_get_info -soup_auth_get_protection_space -soup_auth_get_realm -soup_auth_get_saved_password -soup_auth_get_saved_users -soup_auth_get_scheme_name -soup_auth_get_type -soup_auth_has_saved_password -soup_auth_is_authenticated -soup_auth_is_for_proxy -soup_auth_is_ready -soup_auth_manager_get_type -soup_auth_manager_use_auth -soup_auth_new -soup_auth_ntlm_get_type -soup_auth_save_password -soup_auth_update -soup_buffer_copy -soup_buffer_free -soup_buffer_get_as_bytes -soup_buffer_get_data -soup_buffer_get_owner -soup_buffer_get_type -soup_buffer_new -soup_buffer_new_subbuffer -soup_buffer_new_take -soup_buffer_new_with_owner -soup_byte_array_get_type -soup_cache_clear -soup_cache_dump -soup_cache_flush -soup_cache_get_max_size -soup_cache_get_type -soup_cache_load -soup_cache_new -soup_cache_response_get_type -soup_cache_set_max_size -soup_cache_type_get_type -soup_cacheability_get_type -soup_char_attributes -soup_check_version -soup_client_context_get_address -soup_client_context_get_auth_domain -soup_client_context_get_auth_user -soup_client_context_get_gsocket -soup_client_context_get_host -soup_client_context_get_local_address -soup_client_context_get_remote_address -soup_client_context_get_socket -soup_client_context_get_type -soup_client_context_steal_connection -soup_connection_state_get_type -soup_content_decoder_get_type -soup_content_sniffer_get_buffer_size -soup_content_sniffer_get_type -soup_content_sniffer_new -soup_content_sniffer_sniff -soup_cookie_applies_to_uri -soup_cookie_copy -soup_cookie_domain_matches -soup_cookie_equal -soup_cookie_free -soup_cookie_get_domain -soup_cookie_get_expires -soup_cookie_get_http_only -soup_cookie_get_name -soup_cookie_get_path -soup_cookie_get_secure -soup_cookie_get_type -soup_cookie_get_value -soup_cookie_jar_accept_policy_get_type -soup_cookie_jar_add_cookie -soup_cookie_jar_add_cookie_with_first_party -soup_cookie_jar_all_cookies -soup_cookie_jar_db_get_type -soup_cookie_jar_db_new -soup_cookie_jar_delete_cookie -soup_cookie_jar_get_accept_policy -soup_cookie_jar_get_cookie_list -soup_cookie_jar_get_cookies -soup_cookie_jar_get_type -soup_cookie_jar_is_persistent -soup_cookie_jar_new -soup_cookie_jar_save -soup_cookie_jar_set_accept_policy -soup_cookie_jar_set_cookie -soup_cookie_jar_set_cookie_with_first_party -soup_cookie_jar_text_get_type -soup_cookie_jar_text_new -soup_cookie_new -soup_cookie_parse -soup_cookie_set_domain -soup_cookie_set_expires -soup_cookie_set_http_only -soup_cookie_set_max_age -soup_cookie_set_name -soup_cookie_set_path -soup_cookie_set_secure -soup_cookie_set_value -soup_cookie_to_cookie_header -soup_cookie_to_set_cookie_header -soup_cookies_free -soup_cookies_from_request -soup_cookies_from_response -soup_cookies_to_cookie_header -soup_cookies_to_request -soup_cookies_to_response -soup_date_copy -soup_date_format_get_type -soup_date_free -soup_date_get_day -soup_date_get_hour -soup_date_get_minute -soup_date_get_month -soup_date_get_offset -soup_date_get_second -soup_date_get_type -soup_date_get_utc -soup_date_get_year -soup_date_is_past -soup_date_new -soup_date_new_from_now -soup_date_new_from_string -soup_date_new_from_time_t -soup_date_to_string -soup_date_to_time_t -soup_date_to_timeval -soup_encoding_get_type -soup_expectation_get_type -soup_form_decode -soup_form_decode_multipart -soup_form_encode -soup_form_encode_datalist -soup_form_encode_hash -soup_form_encode_valist -soup_form_request_new -soup_form_request_new_from_datalist -soup_form_request_new_from_hash -soup_form_request_new_from_multipart -soup_get_major_version -soup_get_micro_version -soup_get_minor_version -soup_header_contains -soup_header_free_list -soup_header_free_param_list -soup_header_g_string_append_param -soup_header_g_string_append_param_quoted -soup_header_parse_list -soup_header_parse_param_list -soup_header_parse_quality_list -soup_header_parse_semi_param_list -soup_headers_parse -soup_headers_parse_request -soup_headers_parse_response -soup_headers_parse_status_line -soup_http_error_quark -soup_http_version_get_type -soup_known_status_code_get_type -soup_logger_attach -soup_logger_detach -soup_logger_get_type -soup_logger_log_level_get_type -soup_logger_new -soup_logger_set_printer -soup_logger_set_request_filter -soup_logger_set_response_filter -soup_memory_use_get_type -soup_message_add_header_handler -soup_message_add_status_code_handler -soup_message_body_append -soup_message_body_append_buffer -soup_message_body_append_take -soup_message_body_complete -soup_message_body_flatten -soup_message_body_free -soup_message_body_get_accumulate -soup_message_body_get_chunk -soup_message_body_get_type -soup_message_body_got_chunk -soup_message_body_new -soup_message_body_set_accumulate -soup_message_body_truncate -soup_message_body_wrote_chunk -soup_message_content_sniffed -soup_message_disable_feature -soup_message_finished -soup_message_flags_get_type -soup_message_get_address -soup_message_get_first_party -soup_message_get_flags -soup_message_get_http_version -soup_message_get_https_status -soup_message_get_priority -soup_message_get_soup_request -soup_message_get_type -soup_message_get_uri -soup_message_got_body -soup_message_got_chunk -soup_message_got_headers -soup_message_got_informational -soup_message_headers_append -soup_message_headers_clean_connection_headers -soup_message_headers_clear -soup_message_headers_foreach -soup_message_headers_free -soup_message_headers_free_ranges -soup_message_headers_get -soup_message_headers_get_content_disposition -soup_message_headers_get_content_length -soup_message_headers_get_content_range -soup_message_headers_get_content_type -soup_message_headers_get_encoding -soup_message_headers_get_expectations -soup_message_headers_get_headers_type -soup_message_headers_get_list -soup_message_headers_get_one -soup_message_headers_get_ranges -soup_message_headers_get_type -soup_message_headers_header_contains -soup_message_headers_header_equals -soup_message_headers_iter_init -soup_message_headers_iter_next -soup_message_headers_new -soup_message_headers_remove -soup_message_headers_replace -soup_message_headers_set_content_disposition -soup_message_headers_set_content_length -soup_message_headers_set_content_range -soup_message_headers_set_content_type -soup_message_headers_set_encoding -soup_message_headers_set_expectations -soup_message_headers_set_range -soup_message_headers_set_ranges -soup_message_headers_type_get_type -soup_message_io_cleanup -soup_message_is_keepalive -soup_message_new -soup_message_new_from_uri -soup_message_priority_get_type -soup_message_restarted -soup_message_set_chunk_allocator -soup_message_set_first_party -soup_message_set_flags -soup_message_set_http_version -soup_message_set_priority -soup_message_set_redirect -soup_message_set_request -soup_message_set_response -soup_message_set_status -soup_message_set_status_full -soup_message_set_uri -soup_message_starting -soup_message_wrote_body -soup_message_wrote_body_data -soup_message_wrote_chunk -soup_message_wrote_headers -soup_message_wrote_informational -soup_multipart_append_form_file -soup_multipart_append_form_string -soup_multipart_append_part -soup_multipart_free -soup_multipart_get_length -soup_multipart_get_part -soup_multipart_get_type -soup_multipart_input_stream_get_headers -soup_multipart_input_stream_get_type -soup_multipart_input_stream_new -soup_multipart_input_stream_next_part -soup_multipart_input_stream_next_part_async -soup_multipart_input_stream_next_part_finish -soup_multipart_new -soup_multipart_new_from_message -soup_multipart_to_message -soup_password_manager_get_passwords_async -soup_password_manager_get_passwords_sync -soup_password_manager_get_type -soup_proxy_resolver_default_get_type -soup_proxy_resolver_get_proxy_async -soup_proxy_resolver_get_proxy_sync -soup_proxy_resolver_get_type -soup_proxy_uri_resolver_get_proxy_uri_async -soup_proxy_uri_resolver_get_proxy_uri_sync -soup_proxy_uri_resolver_get_type -soup_request_data_get_type -soup_request_error_get_type -soup_request_error_quark -soup_request_file_get_file -soup_request_file_get_type -soup_request_get_content_length -soup_request_get_content_type -soup_request_get_session -soup_request_get_type -soup_request_get_uri -soup_request_http_get_message -soup_request_http_get_type -soup_request_send -soup_request_send_async -soup_request_send_finish -soup_requester_error_get_type -soup_requester_error_quark -soup_requester_get_type -soup_requester_new -soup_requester_request -soup_requester_request_uri -soup_server_accept_iostream -soup_server_add_auth_domain -soup_server_add_early_handler -soup_server_add_handler -soup_server_add_websocket_handler -soup_server_disconnect -soup_server_get_async_context -soup_server_get_listener -soup_server_get_listeners -soup_server_get_port -soup_server_get_type -soup_server_get_uris -soup_server_is_https -soup_server_listen -soup_server_listen_all -soup_server_listen_fd -soup_server_listen_local -soup_server_listen_options_get_type -soup_server_listen_socket -soup_server_new -soup_server_pause_message -soup_server_quit -soup_server_remove_auth_domain -soup_server_remove_handler -soup_server_run -soup_server_run_async -soup_server_set_ssl_cert_file -soup_server_unpause_message -soup_session_abort -soup_session_add_feature -soup_session_add_feature_by_type -soup_session_async_get_type -soup_session_async_new -soup_session_async_new_with_options -soup_session_cancel_message -soup_session_feature_add_feature -soup_session_feature_attach -soup_session_feature_detach -soup_session_feature_get_type -soup_session_feature_has_feature -soup_session_feature_remove_feature -soup_session_get_async_context -soup_session_get_feature -soup_session_get_feature_for_message -soup_session_get_features -soup_session_get_type -soup_session_has_feature -soup_session_new -soup_session_new_with_options -soup_session_pause_message -soup_session_prefetch_dns -soup_session_prepare_for_uri -soup_session_queue_message -soup_session_redirect_message -soup_session_remove_feature -soup_session_remove_feature_by_type -soup_session_request -soup_session_request_http -soup_session_request_http_uri -soup_session_request_uri -soup_session_requeue_message -soup_session_send -soup_session_send_async -soup_session_send_finish -soup_session_send_message -soup_session_steal_connection -soup_session_sync_get_type -soup_session_sync_new -soup_session_sync_new_with_options -soup_session_unpause_message -soup_session_websocket_connect_async -soup_session_websocket_connect_finish -soup_session_would_redirect -soup_socket_connect_async -soup_socket_connect_sync -soup_socket_disconnect -soup_socket_get_fd -soup_socket_get_local_address -soup_socket_get_remote_address -soup_socket_get_type -soup_socket_io_status_get_type -soup_socket_is_connected -soup_socket_is_ssl -soup_socket_listen -soup_socket_new -soup_socket_read -soup_socket_read_until -soup_socket_start_proxy_ssl -soup_socket_start_ssl -soup_socket_write -soup_ssl_supported -soup_status_get_phrase -soup_status_get_type -soup_status_proxify -soup_str_case_equal -soup_str_case_hash -soup_tld_domain_is_public_suffix -soup_tld_error_get_type -soup_tld_error_quark -soup_tld_get_base_domain -soup_uri_copy -soup_uri_copy_host -soup_uri_decode -soup_uri_encode -soup_uri_equal -soup_uri_free -soup_uri_get_fragment -soup_uri_get_host -soup_uri_get_password -soup_uri_get_path -soup_uri_get_port -soup_uri_get_query -soup_uri_get_scheme -soup_uri_get_type -soup_uri_get_user -soup_uri_host_equal -soup_uri_host_hash -soup_uri_new -soup_uri_new_with_base -soup_uri_normalize -soup_uri_set_fragment -soup_uri_set_host -soup_uri_set_password -soup_uri_set_path -soup_uri_set_port -soup_uri_set_query -soup_uri_set_query_from_fields -soup_uri_set_query_from_form -soup_uri_set_scheme -soup_uri_set_user -soup_uri_to_string -soup_uri_uses_default_port -soup_value_array_append -soup_value_array_append_vals -soup_value_array_from_args -soup_value_array_get_nth -soup_value_array_insert -soup_value_array_new -soup_value_array_new_with_vals -soup_value_array_to_args -soup_value_hash_insert -soup_value_hash_insert_vals -soup_value_hash_insert_value -soup_value_hash_lookup -soup_value_hash_lookup_vals -soup_value_hash_new -soup_value_hash_new_with_vals -soup_websocket_client_prepare_handshake -soup_websocket_client_verify_handshake -soup_websocket_close_code_get_type -soup_websocket_connection_close -soup_websocket_connection_get_close_code -soup_websocket_connection_get_close_data -soup_websocket_connection_get_connection_type -soup_websocket_connection_get_io_stream -soup_websocket_connection_get_origin -soup_websocket_connection_get_protocol -soup_websocket_connection_get_state -soup_websocket_connection_get_type -soup_websocket_connection_get_uri -soup_websocket_connection_new -soup_websocket_connection_send_binary -soup_websocket_connection_send_text -soup_websocket_connection_type_get_type -soup_websocket_data_type_get_type -soup_websocket_error_get_quark -soup_websocket_error_get_type -soup_websocket_server_check_handshake -soup_websocket_server_process_handshake -soup_websocket_state_get_type -soup_xmlrpc_build_fault -soup_xmlrpc_build_method_call -soup_xmlrpc_build_method_response -soup_xmlrpc_build_request -soup_xmlrpc_build_response -soup_xmlrpc_error_get_type -soup_xmlrpc_error_quark -soup_xmlrpc_extract_method_call -soup_xmlrpc_extract_method_response -soup_xmlrpc_fault_get_type -soup_xmlrpc_fault_quark -soup_xmlrpc_message_new -soup_xmlrpc_message_set_fault -soup_xmlrpc_message_set_response -soup_xmlrpc_params_free -soup_xmlrpc_params_parse -soup_xmlrpc_parse_method_call -soup_xmlrpc_parse_method_response -soup_xmlrpc_parse_request -soup_xmlrpc_parse_response -soup_xmlrpc_request_new -soup_xmlrpc_set_fault -soup_xmlrpc_set_response -soup_xmlrpc_variant_get_datetime -soup_xmlrpc_variant_new_datetime diff -Nru libsoup2.4-2.52.2/libsoup/libsoup-gnome-2.4.sym libsoup2.4-2.54.1/libsoup/libsoup-gnome-2.4.sym --- libsoup2.4-2.52.2/libsoup/libsoup-gnome-2.4.sym 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/libsoup-gnome-2.4.sym 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -soup_cookie_jar_sqlite_get_type -soup_cookie_jar_sqlite_new -soup_gnome_features_2_26_get_type -soup_password_manager_gnome_get_type -soup_proxy_resolver_gnome_get_type diff -Nru libsoup2.4-2.52.2/libsoup/Makefile.am libsoup2.4-2.54.1/libsoup/Makefile.am --- libsoup2.4-2.52.2/libsoup/Makefile.am 2015-11-09 20:21:48.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/Makefile.am 2016-03-23 12:10:56.000000000 +0000 @@ -10,9 +10,12 @@ LIBWS2_32 = -lws2_32 endif +SOUP_COMMON_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"libsoup\" \ + -DLIBSOUP_COMPILATION + AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"libsoup\" \ - -DLIBSOUP_COMPILATION \ + $(SOUP_COMMON_CPPFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ @@ -20,7 +23,8 @@ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(SQLITE_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(KRB5_CFLAGS) libsoupincludedir = $(includedir)/libsoup-2.4/libsoup @@ -86,19 +90,20 @@ lib_LTLIBRARIES = libsoup-2.4.la +libsoup_2_4_la_CFLAGS = $(AM_CFLAGS) $(SOUP_HIDDEN_VISIBILITY_CFLAGS) + libsoup_2_4_la_LDFLAGS = \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ -no-undefined \ - -export-symbols $(srcdir)/libsoup-2.4.sym \ + -export-dynamic \ $(CODE_COVERAGE_LDFLAGS) -EXTRA_DIST += libsoup-2.4.sym - libsoup_2_4_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBWS2_32) \ $(XML_LIBS) \ - $(SQLITE_LIBS) + $(SQLITE_LIBS) \ + $(KRB5_LIBS) libsoup_2_4_la_SOURCES = \ gconstructor.h \ @@ -110,6 +115,8 @@ soup-auth-digest.c \ soup-auth-ntlm.h \ soup-auth-ntlm.c \ + soup-auth-negotiate.h \ + soup-auth-negotiate.c \ soup-auth-domain.c \ soup-auth-domain-basic.c \ soup-auth-domain-digest.c \ @@ -221,12 +228,12 @@ lib_LTLIBRARIES += libsoup-gnome-2.4.la +libsoup_gnome_2_4_la_CFLAGS = $(AM_CFLAGS) $(SOUP_HIDDEN_VISIBILITY_CFLAGS) + libsoup_gnome_2_4_la_LDFLAGS = \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ -no-undefined \ - -export-symbols $(srcdir)/libsoup-gnome-2.4.sym - -EXTRA_DIST += libsoup-gnome-2.4.sym + -export-dynamic libsoup_gnome_2_4_la_LIBADD = \ libsoup-2.4.la \ @@ -249,6 +256,7 @@ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API" +soup_enum_types_MKENUMS_H_FLAGS = --fhead "\#include \n\#define GLIB_MKENUMS_EXTERN _SOUP_EXTERN\n" # # Introspection support @@ -260,6 +268,8 @@ if HAVE_INTROSPECTION +SOUP_UNSTABLE_REQUEST_CFLAG = -DLIBSOUP_USE_UNSTABLE_REQUEST_API + # Core library gi_soup_files = \ $(filter-out soup.h soup-enum-types.% soup-proxy-resolver.h,\ @@ -268,7 +278,7 @@ Soup-2.4.gir: libsoup-2.4.la Soup_2_4_gir_INCLUDES = Gio-2.0 -Soup_2_4_gir_CFLAGS = $(AM_CPPFLAGS) -DLIBSOUP_USE_UNSTABLE_REQUEST_API +Soup_2_4_gir_CFLAGS = $(AM_CPPFLAGS) $(SOUP_UNSTABLE_REQUEST_CFLAG) Soup_2_4_gir_LIBS = libsoup-2.4.la Soup_2_4_gir_EXPORT_PACKAGES = libsoup-2.4 Soup_2_4_gir_SCANNERFLAGS = --c-include "libsoup/soup.h" @@ -294,14 +304,17 @@ if BUILD_LIBSOUP_GNOME +SOUPGNOME_GIR_SCANNER_BASE_FLAGS = \ + --identifier-prefix=Soup \ + --symbol-prefix=soup + # GNOME extensions gi_soup_gnome_files = $(filter-out soup-gnome.h,\ $(libsoupgnomeinclude_HEADERS) \ $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir SoupGNOME_2_4_gir_SCANNERFLAGS = \ - --identifier-prefix=Soup \ - --symbol-prefix=soup \ + $(SOUPGNOME_GIR_SCANNER_BASE_FLAGS) \ --c-include "libsoup/soup-gnome.h" \ --include-uninstalled=$(builddir)/Soup-2.4.gir SoupGNOME_2_4_gir_CFLAGS = $(AM_CPPFLAGS) @@ -323,14 +336,71 @@ endif -# We only do this check on Linux, so we don't have to worry about -# different "nm" output on other platforms -if OS_LINUX -check-local: - @echo Checking libsoup-2.4.so symbols - @nm $(builddir)/.libs/libsoup-2.4.so | \ - grep "^[[:xdigit:]]\+ [BGTRS] " | \ - sed "s/^[[:xdigit:]]\+ [BGTRS] //" | \ - env LC_ALL=C sort -u | \ - diff -U0 $(srcdir)/libsoup-2.4.sym - >&2 +# ------ MSVC Project File Generation ------ +MSVCPROJS = soup soup-gnome + +soup_FILES = $(libsoup_2_4_la_SOURCES) +soup_EXCLUDES = dummy + +soup_HEADERS_DIR = $(libsoupincludedir) +soup_HEADERS_INST = $(libsoupinclude_HEADERS) $(nodist_libsoupinclude_HEADERS) +soup_HEADERS_EXCLUDES = dummy + +soup_gnome_FILES = $(libsoup_gnome_2_4_la_SOURCES) +soup_gnome_EXCLUDES = dummy + +soup_gnome_HEADERS_DIR = $(libsoupgnomeincludedir) +soup_gnome_HEADERS_INST = $(libsoupgnomeinclude_HEADERS) +soup_gnome_HEADERS_EXCLUDES = dummy + +include $(top_srcdir)/build/Makefile.msvcproj + +if HAVE_INTROSPECTION +# Introspection Items for MSVC +MSVC_INTROSPECT_GIRS = Soup-2.4.gir +if BUILD_LIBSOUP_GNOME +MSVC_INTROSPECT_GIRS += SoupGNOME-2.4.gir +endif + +BASE_MSVC_GIR_CFLAGS = \ + $(SOUP_COMMON_CPPFLAGS) \ + -I../.. + +INTROSPECTION_INTERMEDIATE_ITEMS = \ + $(top_builddir)/build/win32/Soup-2.4.gir.msvc.introspect \ + $(top_builddir)/build/win32/Soup_2_4_gir_list \ + $(top_builddir)/build/win32/SoupGNOME-2.4.gir.msvc.introspect \ + $(top_builddir)/build/win32/SoupGNOME_2_4_gir_list + +# libsoup +Soup_2_4_gir_MSVC_FILES = $(gi_soup_files) $(gi_built_soup_files) +Soup_2_4_gir_MSVC_EXPORT_PACKAGES = $(Soup_2_4_gir_EXPORT_PACKAGES) +Soup_2_4_gir_MSVC_INCLUDE_GIRS = $(Soup_2_4_gir_INCLUDES) +Soup_2_4_gir_MSVC_LIBS = soup-2.4 +Soup_2_4_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) $(SOUP_UNSTABLE_REQUEST_CFLAG) +Soup_2_4_gir_MSVC_SCANNERFLAGS = --c-include \"libsoup/soup.h\" + +if BUILD_LIBSOUP_GNOME +# libsoup-gnome +SoupGNOME_2_4_gir_MSVC_FILES = $(gi_soup_gnome_files) +SoupGNOME_2_4_gir_MSVC_GIR_DEPS = Soup-2.4.gir +SoupGNOME_2_4_gir_MSVC_EXPORT_PACKAGES = $(SoupGNOME_2_4_gir_EXPORT_PACKAGES) +SoupGNOME_2_4_gir_MSVC_LIBS = soup-gnome-2.4 soup-2.4 +SoupGNOME_2_4_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) +SoupGNOME_2_4_gir_MSVC_SCANNERFLAGS = i \ + $(SOUPGNOME_GIR_SCANNER_BASE_FLAGS) \ + --c-include \"libsoup/soup-gnome.h\" \ + --include-uninstalled=./Soup-2.4.gir endif + +include $(top_srcdir)/build/Makefile.msvc-introspection +else +INTROSPECTION_INTERMEDIATE_ITEMS = +endif + +dist-hook: \ + $(top_builddir)/build/win32/vs9/soup.vcproj \ + $(top_builddir)/build/win32/vs9/soup.headers \ + $(top_builddir)/build/win32/vs9/soup-gnome.vcproj \ + $(top_builddir)/build/win32/vs9/soup-gnome.headers \ + $(INTROSPECTION_INTERMEDIATE_ITEMS) diff -Nru libsoup2.4-2.52.2/libsoup/Makefile.in libsoup2.4-2.54.1/libsoup/Makefile.in --- libsoup2.4-2.52.2/libsoup/Makefile.in 2015-11-09 20:25:05.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/Makefile.in 2016-04-26 12:36:13.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,10 +14,82 @@ @SET_MAKE@ +# Author: Fan, Chun-wei +# Common Autotools file used to generate Visual Studio 2008+ +# Projects from their templates + +# This autotools file, from GLib, can be used in other projects +# that have Visual Studio build support, and is copied into +# $(srcroot)/build/. + +# * Input variables: +# +# MSVCPROJS - List of Projects that should be generated +# +# * Simple tutorial +# +# Add this to Makefile.am where your library/program is built: +# include $(top_srcdir)/build/Makefile.msvcproj +# MSVCPROJS = YourProject (can be multiple projects in a single srcdir) +# YourProject_FILES = $(libyourlib_1_0_SOURCES) +# YourProject_EXCLUDES = ... # list of sources to exclude, separated by '|', wildcards allowed; use random unsed value if none +# YourProject_HEADERS_DIR = $(libyourlibincludedir) +# YourProject_HEADERS_INST = $(libyourlib_1_0_HEADERS) +# YourProject_HEADERS_EXCLUDES = ... # +# +# dist-hook: \ # (or add to it if it is already there, note the vs9 items will also call the vs10 items in the process) +# $(top_builddir)/build/win32/vs9/YourProject.vcproj \ +# $(top_builddir)/build/win32/vs9/YourProject.headers + +# Private functions + +# Author: Fan, Chun-wei +# Common autotools file for constructing the g-ir-scanner and +# g-ir-compiler command lines for Visual Studio builds. + +# This is copied from $(srcroot)/build from the gobject-introspection +# project, which may be included in projects that support both +# Visual Studio builds and introspection. + +# * Input variables: +# +# MSVC_INTROSPECT_GIRS - List of .gir's that should be built +# in the NMake Makefiles +# +# * Simple tutorial +# +# Add this to Makefile.am where your library/program is built: +# (Either YourLib_1_0_gir_MSVC_LIBS or YourLib_1_0_gir_MSVC_PROGRAM +# is required unless --headers-only is specified in +# YourLib_1_0_gir__MSVC_SCANNERFLAGS) +# +# include $(top_srcdir)/build/Makefile.msvc-introspection +# MSVC_INTROSPECT_GIRS = YourLib-1.0.gir +# YourLib_1_0_gir_NAMESPACE = YourLib # This is optional +# YourLib_1_0_gir_VERSION = 1.0 # This is optional +# YourLib_1_0_gir_MSVC_LIBS = yourlib-1.0 +# YourLib_1_0_gir_MSVC_FILES = $(libyourlib_1_0_SOURCES) +# YourLib_1_0_gir_MSVC_PROGRAM = YourProgram +# YourLib_1_0_gir_MSVC_PACKAGES = (Dependent .pc files) +# YourLib_1_0_gir_MSVC_INCLUDE_GIRS = (Dependent external .gir's) +# YourLiv_1_0_gir_MSVC_EXPORT_PACKAGES = (Packages exported by this .gir) + +# Private functions + VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -81,17 +153,13 @@ build_triplet = @build@ host_triplet = @host@ @BUILD_LIBSOUP_GNOME_TRUE@am__append_1 = libsoup-gnome-2.4.la -@BUILD_LIBSOUP_GNOME_TRUE@am__append_2 = libsoup-gnome-2.4.sym -@HAVE_INTROSPECTION_TRUE@am__append_3 = Soup-2.4.gir -@ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_4 = libsoup-2.4.vapi -@HAVE_INTROSPECTION_TRUE@am__append_5 = Soup-2.4.metadata Soup-2.4-custom.vala libsoup-2.4.deps -@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_6 = SoupGNOME-2.4.gir -@HAVE_INTROSPECTION_TRUE@am__append_7 = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) +@HAVE_INTROSPECTION_TRUE@am__append_2 = Soup-2.4.gir +@ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_3 = libsoup-2.4.vapi +@HAVE_INTROSPECTION_TRUE@am__append_4 = Soup-2.4.metadata Soup-2.4-custom.vala libsoup-2.4.deps +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_5 = SoupGNOME-2.4.gir +@HAVE_INTROSPECTION_TRUE@am__append_6 = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_7 = SoupGNOME-2.4.gir subdir = libsoup -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(srcdir)/soup-version.h.in $(top_srcdir)/build-aux/depcomp \ - $(am__libsoupgnomeinclude_HEADERS_DIST) \ - $(libsoupinclude_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ @@ -102,6 +170,9 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am \ + $(am__libsoupgnomeinclude_HEADERS_DIST) \ + $(libsoupinclude_HEADERS) $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = soup-version.h @@ -142,36 +213,73 @@ am__DEPENDENCIES_1 = libsoup_2_4_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) -am_libsoup_2_4_la_OBJECTS = soup-address.lo soup-auth.lo \ - soup-auth-basic.lo soup-auth-digest.lo soup-auth-ntlm.lo \ - soup-auth-domain.lo soup-auth-domain-basic.lo \ - soup-auth-domain-digest.lo soup-auth-manager.lo \ - soup-body-input-stream.lo soup-body-output-stream.lo \ - soup-cache.lo soup-cache-client-input-stream.lo \ - soup-cache-input-stream.lo soup-client-input-stream.lo \ - soup-connection.lo soup-connection-auth.lo \ - soup-content-decoder.lo soup-content-processor.lo \ - soup-content-sniffer.lo soup-content-sniffer-stream.lo \ - soup-converter-wrapper.lo soup-cookie.lo soup-cookie-jar.lo \ - soup-cookie-jar-db.lo soup-cookie-jar-text.lo soup-date.lo \ - soup-directory-input-stream.lo soup-enum-types.lo \ - soup-filter-input-stream.lo soup-form.lo soup-headers.lo \ - soup-init.lo soup-io-stream.lo soup-logger.lo soup-message.lo \ - soup-message-body.lo soup-message-client-io.lo \ - soup-message-headers.lo soup-message-io.lo \ - soup-message-queue.lo soup-message-server-io.lo soup-method.lo \ - soup-misc.lo soup-multipart.lo soup-multipart-input-stream.lo \ - soup-password-manager.lo soup-path-map.lo \ - soup-proxy-resolver.lo soup-proxy-resolver-default.lo \ - soup-proxy-resolver-wrapper.lo soup-proxy-uri-resolver.lo \ - soup-request.lo soup-request-data.lo soup-request-file.lo \ - soup-request-http.lo soup-requester.lo soup-server.lo \ - soup-session.lo soup-session-async.lo soup-session-feature.lo \ - soup-session-sync.lo soup-socket.lo soup-socket-properties.lo \ - soup-status.lo soup-tld.lo soup-uri.lo soup-value-utils.lo \ - soup-version.lo soup-websocket.lo soup-websocket-connection.lo \ - soup-xmlrpc.lo soup-xmlrpc-old.lo + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_libsoup_2_4_la_OBJECTS = libsoup_2_4_la-soup-address.lo \ + libsoup_2_4_la-soup-auth.lo libsoup_2_4_la-soup-auth-basic.lo \ + libsoup_2_4_la-soup-auth-digest.lo \ + libsoup_2_4_la-soup-auth-ntlm.lo \ + libsoup_2_4_la-soup-auth-negotiate.lo \ + libsoup_2_4_la-soup-auth-domain.lo \ + libsoup_2_4_la-soup-auth-domain-basic.lo \ + libsoup_2_4_la-soup-auth-domain-digest.lo \ + libsoup_2_4_la-soup-auth-manager.lo \ + libsoup_2_4_la-soup-body-input-stream.lo \ + libsoup_2_4_la-soup-body-output-stream.lo \ + libsoup_2_4_la-soup-cache.lo \ + libsoup_2_4_la-soup-cache-client-input-stream.lo \ + libsoup_2_4_la-soup-cache-input-stream.lo \ + libsoup_2_4_la-soup-client-input-stream.lo \ + libsoup_2_4_la-soup-connection.lo \ + libsoup_2_4_la-soup-connection-auth.lo \ + libsoup_2_4_la-soup-content-decoder.lo \ + libsoup_2_4_la-soup-content-processor.lo \ + libsoup_2_4_la-soup-content-sniffer.lo \ + libsoup_2_4_la-soup-content-sniffer-stream.lo \ + libsoup_2_4_la-soup-converter-wrapper.lo \ + libsoup_2_4_la-soup-cookie.lo \ + libsoup_2_4_la-soup-cookie-jar.lo \ + libsoup_2_4_la-soup-cookie-jar-db.lo \ + libsoup_2_4_la-soup-cookie-jar-text.lo \ + libsoup_2_4_la-soup-date.lo \ + libsoup_2_4_la-soup-directory-input-stream.lo \ + libsoup_2_4_la-soup-enum-types.lo \ + libsoup_2_4_la-soup-filter-input-stream.lo \ + libsoup_2_4_la-soup-form.lo libsoup_2_4_la-soup-headers.lo \ + libsoup_2_4_la-soup-init.lo libsoup_2_4_la-soup-io-stream.lo \ + libsoup_2_4_la-soup-logger.lo libsoup_2_4_la-soup-message.lo \ + libsoup_2_4_la-soup-message-body.lo \ + libsoup_2_4_la-soup-message-client-io.lo \ + libsoup_2_4_la-soup-message-headers.lo \ + libsoup_2_4_la-soup-message-io.lo \ + libsoup_2_4_la-soup-message-queue.lo \ + libsoup_2_4_la-soup-message-server-io.lo \ + libsoup_2_4_la-soup-method.lo libsoup_2_4_la-soup-misc.lo \ + libsoup_2_4_la-soup-multipart.lo \ + libsoup_2_4_la-soup-multipart-input-stream.lo \ + libsoup_2_4_la-soup-password-manager.lo \ + libsoup_2_4_la-soup-path-map.lo \ + libsoup_2_4_la-soup-proxy-resolver.lo \ + libsoup_2_4_la-soup-proxy-resolver-default.lo \ + libsoup_2_4_la-soup-proxy-resolver-wrapper.lo \ + libsoup_2_4_la-soup-proxy-uri-resolver.lo \ + libsoup_2_4_la-soup-request.lo \ + libsoup_2_4_la-soup-request-data.lo \ + libsoup_2_4_la-soup-request-file.lo \ + libsoup_2_4_la-soup-request-http.lo \ + libsoup_2_4_la-soup-requester.lo libsoup_2_4_la-soup-server.lo \ + libsoup_2_4_la-soup-session.lo \ + libsoup_2_4_la-soup-session-async.lo \ + libsoup_2_4_la-soup-session-feature.lo \ + libsoup_2_4_la-soup-session-sync.lo \ + libsoup_2_4_la-soup-socket.lo \ + libsoup_2_4_la-soup-socket-properties.lo \ + libsoup_2_4_la-soup-status.lo libsoup_2_4_la-soup-tld.lo \ + libsoup_2_4_la-soup-uri.lo libsoup_2_4_la-soup-value-utils.lo \ + libsoup_2_4_la-soup-version.lo \ + libsoup_2_4_la-soup-websocket.lo \ + libsoup_2_4_la-soup-websocket-connection.lo \ + libsoup_2_4_la-soup-xmlrpc.lo \ + libsoup_2_4_la-soup-xmlrpc-old.lo libsoup_2_4_la_OBJECTS = $(am_libsoup_2_4_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -179,24 +287,23 @@ am__v_lt_1 = libsoup_2_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) $(LDFLAGS) -o \ - $@ + $(libsoup_2_4_la_CFLAGS) $(CFLAGS) $(libsoup_2_4_la_LDFLAGS) \ + $(LDFLAGS) -o $@ @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_DEPENDENCIES = \ @BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la $(am__DEPENDENCIES_1) am__libsoup_gnome_2_4_la_SOURCES_DIST = soup-cookie-jar-sqlite.c \ soup-gnome-features.c soup-proxy-resolver-gnome.h \ soup-proxy-resolver-gnome.c soup-password-manager-gnome.h \ soup-password-manager-gnome.c -@BUILD_LIBSOUP_GNOME_TRUE@am_libsoup_gnome_2_4_la_OBJECTS = \ -@BUILD_LIBSOUP_GNOME_TRUE@ soup-cookie-jar-sqlite.lo \ -@BUILD_LIBSOUP_GNOME_TRUE@ soup-gnome-features.lo \ -@BUILD_LIBSOUP_GNOME_TRUE@ soup-proxy-resolver-gnome.lo \ -@BUILD_LIBSOUP_GNOME_TRUE@ soup-password-manager-gnome.lo +@BUILD_LIBSOUP_GNOME_TRUE@am_libsoup_gnome_2_4_la_OBJECTS = libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.lo \ +@BUILD_LIBSOUP_GNOME_TRUE@ libsoup_gnome_2_4_la-soup-gnome-features.lo \ +@BUILD_LIBSOUP_GNOME_TRUE@ libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.lo \ +@BUILD_LIBSOUP_GNOME_TRUE@ libsoup_gnome_2_4_la-soup-password-manager-gnome.lo libsoup_gnome_2_4_la_OBJECTS = $(am_libsoup_gnome_2_4_la_OBJECTS) libsoup_gnome_2_4_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ - $(AM_CFLAGS) $(CFLAGS) $(libsoup_gnome_2_4_la_LDFLAGS) \ - $(LDFLAGS) -o $@ + $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) \ + $(libsoup_gnome_2_4_la_LDFLAGS) $(LDFLAGS) -o $@ @BUILD_LIBSOUP_GNOME_TRUE@am_libsoup_gnome_2_4_la_rpath = -rpath \ @BUILD_LIBSOUP_GNOME_TRUE@ $(libdir) AM_V_P = $(am__v_P_@AM_V@) @@ -265,6 +372,10 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/soup-version.h.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build/Makefile.msvc-introspection \ + $(top_srcdir)/build/Makefile.msvcproj DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -291,7 +402,6 @@ CPPFLAGS = @CPPFLAGS@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -344,6 +454,9 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -353,6 +466,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -384,6 +498,7 @@ SOUP_API_VERSION = @SOUP_API_VERSION@ SOUP_CURRENT = @SOUP_CURRENT@ SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ @@ -460,13 +575,15 @@ top_srcdir = @top_srcdir@ # TLD rules -EXTRA_DIST = libsoup-2.4.sym tld-parser.py $(am__append_2) \ - $(am__append_5) -CLEANFILES = $(am__append_4) $(am__append_7) +EXTRA_DIST = tld-parser.py $(am__append_4) +CLEANFILES = $(am__append_3) $(am__append_6) @OS_WIN32_TRUE@LIBWS2_32 = -lws2_32 +SOUP_COMMON_CPPFLAGS = \ + -DG_LOG_DOMAIN=\"libsoup\" \ + -DLIBSOUP_COMPILATION + AM_CPPFLAGS = \ - -DG_LOG_DOMAIN=\"libsoup\" \ - -DLIBSOUP_COMPILATION \ + $(SOUP_COMMON_CPPFLAGS) \ -DLOCALEDIR=\"$(localedir)\" \ -I$(top_srcdir) \ -I$(top_builddir) \ @@ -474,7 +591,8 @@ $(GLIB_CFLAGS) \ $(XML_CFLAGS) \ $(SQLITE_CFLAGS) \ - $(CODE_COVERAGE_CFLAGS) + $(CODE_COVERAGE_CFLAGS) \ + $(KRB5_CFLAGS) libsoupincludedir = $(includedir)/libsoup-2.4/libsoup soup_headers = \ @@ -538,17 +656,19 @@ soup-version.h lib_LTLIBRARIES = libsoup-2.4.la $(am__append_1) +libsoup_2_4_la_CFLAGS = $(AM_CFLAGS) $(SOUP_HIDDEN_VISIBILITY_CFLAGS) libsoup_2_4_la_LDFLAGS = \ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ -no-undefined \ - -export-symbols $(srcdir)/libsoup-2.4.sym \ + -export-dynamic \ $(CODE_COVERAGE_LDFLAGS) libsoup_2_4_la_LIBADD = \ $(GLIB_LIBS) \ $(LIBWS2_32) \ $(XML_LIBS) \ - $(SQLITE_LIBS) + $(SQLITE_LIBS) \ + $(KRB5_LIBS) libsoup_2_4_la_SOURCES = \ gconstructor.h \ @@ -560,6 +680,8 @@ soup-auth-digest.c \ soup-auth-ntlm.h \ soup-auth-ntlm.c \ + soup-auth-negotiate.h \ + soup-auth-negotiate.c \ soup-auth-domain.c \ soup-auth-domain-basic.c \ soup-auth-domain-digest.c \ @@ -659,10 +781,11 @@ @BUILD_LIBSOUP_GNOME_TRUE@ soup-gnome.h \ @BUILD_LIBSOUP_GNOME_TRUE@ soup-gnome-features.h +@BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_CFLAGS = $(AM_CFLAGS) $(SOUP_HIDDEN_VISIBILITY_CFLAGS) @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LDFLAGS = \ @BUILD_LIBSOUP_GNOME_TRUE@ -version-info $(SOUP_CURRENT):$(SOUP_REVISION):$(SOUP_AGE) \ @BUILD_LIBSOUP_GNOME_TRUE@ -no-undefined \ -@BUILD_LIBSOUP_GNOME_TRUE@ -export-symbols $(srcdir)/libsoup-gnome-2.4.sym +@BUILD_LIBSOUP_GNOME_TRUE@ -export-dynamic @BUILD_LIBSOUP_GNOME_TRUE@libsoup_gnome_2_4_la_LIBADD = \ @BUILD_LIBSOUP_GNOME_TRUE@ libsoup-2.4.la \ @@ -683,9 +806,11 @@ soup_enum_types_sources = $(libsoupinclude_HEADERS) $(libsoupgnomeinclude_HEADERS) soup_enum_types_MKENUMS_C_FLAGS = --fhead "\#define LIBSOUP_USE_UNSTABLE_REQUEST_API" -INTROSPECTION_GIRS = $(am__append_3) $(am__append_6) +soup_enum_types_MKENUMS_H_FLAGS = --fhead "\#include \n\#define GLIB_MKENUMS_EXTERN _SOUP_EXTERN\n" +INTROSPECTION_GIRS = $(am__append_2) $(am__append_5) INTROSPECTION_SCANNER_ARGS = --add-include-path=. INTROSPECTION_COMPILER_ARGS = --includedir=. +@HAVE_INTROSPECTION_TRUE@SOUP_UNSTABLE_REQUEST_CFLAG = -DLIBSOUP_USE_UNSTABLE_REQUEST_API # Core library @HAVE_INTROSPECTION_TRUE@gi_soup_files = \ @@ -694,7 +819,7 @@ @HAVE_INTROSPECTION_TRUE@gi_built_soup_files = soup-enum-types.h @HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_INCLUDES = Gio-2.0 -@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_CFLAGS = $(AM_CPPFLAGS) -DLIBSOUP_USE_UNSTABLE_REQUEST_API +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_CFLAGS = $(AM_CPPFLAGS) $(SOUP_UNSTABLE_REQUEST_CFLAG) @HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_LIBS = libsoup-2.4.la @HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_EXPORT_PACKAGES = libsoup-2.4 @HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_SCANNERFLAGS = --c-include "libsoup/soup.h" @@ -707,6 +832,10 @@ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@vapidir = $(VAPIDIR) @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@vapi_DATA = libsoup-2.4.vapi libsoup-2.4.deps +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SOUPGNOME_GIR_SCANNER_BASE_FLAGS = \ +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Soup \ +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --symbol-prefix=soup + # GNOME extensions @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@gi_soup_gnome_files = $(filter-out soup-gnome.h,\ @@ -714,8 +843,7 @@ @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ $(filter-out %.h, $(libsoup_gnome_2_4_la_SOURCES))) @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_SCANNERFLAGS = \ -@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Soup \ -@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --symbol-prefix=soup \ +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ $(SOUPGNOME_GIR_SCANNER_BASE_FLAGS) \ @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --c-include "libsoup/soup-gnome.h" \ @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --include-uninstalled=$(builddir)/Soup-2.4.gir @@ -727,12 +855,101 @@ @HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS) @HAVE_INTROSPECTION_TRUE@typelibdir = $(libdir)/girepository-1.0 @HAVE_INTROSPECTION_TRUE@typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +# ------ MSVC Project File Generation ------ +MSVCPROJS = soup soup-gnome +soup_FILES = $(libsoup_2_4_la_SOURCES) +soup_EXCLUDES = dummy +soup_HEADERS_DIR = $(libsoupincludedir) +soup_HEADERS_INST = $(libsoupinclude_HEADERS) $(nodist_libsoupinclude_HEADERS) +soup_HEADERS_EXCLUDES = dummy +soup_gnome_FILES = $(libsoup_gnome_2_4_la_SOURCES) +soup_gnome_EXCLUDES = dummy +soup_gnome_HEADERS_DIR = $(libsoupgnomeincludedir) +soup_gnome_HEADERS_INST = $(libsoupgnomeinclude_HEADERS) +soup_gnome_HEADERS_EXCLUDES = dummy +_proj_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1)))) +_proj_path_raw := $(subst $(abs_top_srcdir),,$(abs_srcdir)) +_proj_path = $(subst /,\\,$(_proj_path_raw)) +_proj_subdir_int = $(subst \\\\,\\,\\$(_proj_path)\\) +_proj_subdir = $(subst \\.\\,\\,$(_proj_subdir_int)) +_proj_files_raw = $(subst /,\\,$($(_proj_name)_FILES)) +_proj_files = $(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_files_raw)))) +_proj_filters = $($(_proj_name)_EXCLUDES) +_proj_headers_raw = $(subst /,\\,$($(_proj_name)_HEADERS_INST)) +_proj_headers = $(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_proj_path)\\,\\,$(_proj_headers_raw)))) +_proj_headers_excludes = $($(_proj_name)_HEADERS_EXCLUDES) +_headers_dest_posix = $(subst $(includedir),,$($(_proj_name)_HEADERS_DIR)) +_headers_destdir = $(subst /,\\,$(_headers_dest_posix)) + +# Introspection Items for MSVC +@HAVE_INTROSPECTION_TRUE@MSVC_INTROSPECT_GIRS = Soup-2.4.gir \ +@HAVE_INTROSPECTION_TRUE@ $(am__append_7) +@HAVE_INTROSPECTION_TRUE@BASE_MSVC_GIR_CFLAGS = \ +@HAVE_INTROSPECTION_TRUE@ $(SOUP_COMMON_CPPFLAGS) \ +@HAVE_INTROSPECTION_TRUE@ -I../.. + +@HAVE_INTROSPECTION_FALSE@INTROSPECTION_INTERMEDIATE_ITEMS = +@HAVE_INTROSPECTION_TRUE@INTROSPECTION_INTERMEDIATE_ITEMS = \ +@HAVE_INTROSPECTION_TRUE@ $(top_builddir)/build/win32/Soup-2.4.gir.msvc.introspect \ +@HAVE_INTROSPECTION_TRUE@ $(top_builddir)/build/win32/Soup_2_4_gir_list \ +@HAVE_INTROSPECTION_TRUE@ $(top_builddir)/build/win32/SoupGNOME-2.4.gir.msvc.introspect \ +@HAVE_INTROSPECTION_TRUE@ $(top_builddir)/build/win32/SoupGNOME_2_4_gir_list + + +# libsoup +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_MSVC_FILES = $(gi_soup_files) $(gi_built_soup_files) +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_MSVC_EXPORT_PACKAGES = $(Soup_2_4_gir_EXPORT_PACKAGES) +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_MSVC_INCLUDE_GIRS = $(Soup_2_4_gir_INCLUDES) +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_MSVC_LIBS = soup-2.4 +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) $(SOUP_UNSTABLE_REQUEST_CFLAG) +@HAVE_INTROSPECTION_TRUE@Soup_2_4_gir_MSVC_SCANNERFLAGS = --c-include \"libsoup/soup.h\" + +# libsoup-gnome +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_MSVC_FILES = $(gi_soup_gnome_files) +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_MSVC_GIR_DEPS = Soup-2.4.gir +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_MSVC_EXPORT_PACKAGES = $(SoupGNOME_2_4_gir_EXPORT_PACKAGES) +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_MSVC_LIBS = soup-gnome-2.4 soup-2.4 +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS) +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME_2_4_gir_MSVC_SCANNERFLAGS = i \ +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ $(SOUPGNOME_GIR_SCANNER_BASE_FLAGS) \ +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --c-include \"libsoup/soup-gnome.h\" \ +@BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@ --include-uninstalled=./Soup-2.4.gir + +@HAVE_INTROSPECTION_TRUE@_gir_name = $(subst /,_,$(subst -,_,$(subst .,_,$(1)))) + +# Namespace and Version is either fetched from the gir filename +# or the _NAMESPACE/_VERSION variable combo +@HAVE_INTROSPECTION_TRUE@_gir_namespace_msvc = $(or $($(_gir_name)_NAMESPACE),$(firstword $(subst -, ,$(notdir $(1))))) +@HAVE_INTROSPECTION_TRUE@_gir_version_msvc = $(or $($(_gir_name)_VERSION),$(lastword $(subst -, ,$(1:.gir=)))) +@HAVE_INTROSPECTION_TRUE@_typelib_basename_msvc = $(_gir_namespace_msvc)'-'$(_gir_version_msvc) + +# _PROGRAM is an optional variable which needs its own --program argument +@HAVE_INTROSPECTION_TRUE@_gir_program_msvc = $(if $($(_gir_name)_MSVC_PROGRAM),--program=$($(_gir_name)_MSVC_PROGRAM)) + +# Deduce the sub-folder from $(srcroot) where the sources reside in +@HAVE_INTROSPECTION_TRUE@_gir_source_path_raw_msvc := $(subst $(abs_top_srcdir),,$(abs_srcdir)) +@HAVE_INTROSPECTION_TRUE@_gir_source_path_msvc = $(subst /,\\,$(_gir_source_path_raw_msvc)) +@HAVE_INTROSPECTION_TRUE@_gir_source_subdir_int_msvc = $(subst \\\\,\\,\\$(_gir_source_path_msvc)\\) +@HAVE_INTROSPECTION_TRUE@_gir_source_subdir_msvc = $(subst \\.\\,\\,$(_gir_source_subdir_int_msvc)) +@HAVE_INTROSPECTION_TRUE@_gir_files_raw_msvc = $(subst /,\\,$($(_gir_name)_MSVC_FILES)) +@HAVE_INTROSPECTION_TRUE@_gir_files_msvc = $(subst $(srcdir)\\,,$(subst $(builddir)\\,,$(subst $(top_builddir)\\$(_gir_source_path_msvc)\\,\\,$(_gir_files_raw_msvc)))) + +# Create a list of items for: +# - Libraries +# - Packages +# - GIRs to include +# - packages to export +@HAVE_INTROSPECTION_TRUE@_gir_libraries_msvc = $(foreach lib,$($(_gir_name)_MSVC_LIBS),--library=$(lib)) +@HAVE_INTROSPECTION_TRUE@_gir_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_PACKAGES),--pkg=$(pkg)) +@HAVE_INTROSPECTION_TRUE@_gir_includes_msvc = $(foreach include,$($(_gir_name)_MSVC_INCLUDE_GIRS),--include=$(include)) +@HAVE_INTROSPECTION_TRUE@_gir_export_packages_msvc = $(foreach pkg,$($(_gir_name)_MSVC_EXPORT_PACKAGES),--pkg-export=$(pkg)) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/build/Makefile.msvc-introspection $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -744,7 +961,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libsoup/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign libsoup/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -753,6 +969,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(top_srcdir)/build/Makefile.msvcproj $(top_srcdir)/build/Makefile.msvc-introspection $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -812,83 +1029,84 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-address.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-basic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-digest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-domain-basic.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-domain-digest.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-domain.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth-ntlm.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-auth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-body-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-body-output-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cache-client-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cache-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cache.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-client-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-connection-auth.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-connection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-content-decoder.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-content-processor.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-content-sniffer-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-content-sniffer.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-converter-wrapper.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cookie-jar-db.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cookie-jar-sqlite.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cookie-jar-text.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cookie-jar.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-cookie.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-date.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-directory-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-enum-types.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-filter-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-form.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-gnome-features.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-headers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-init.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-io-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-logger.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message-body.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message-client-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message-headers.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message-queue.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message-server-io.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-message.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-method.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-misc.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-multipart-input-stream.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-multipart.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-password-manager-gnome.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-password-manager.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-path-map.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-proxy-resolver-default.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-proxy-resolver-gnome.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-proxy-resolver-wrapper.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-proxy-resolver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-proxy-uri-resolver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-request-data.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-request-file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-request-http.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-request.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-requester.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-server.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-session-async.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-session-feature.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-session-sync.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-session.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-socket-properties.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-socket.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-status.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-tld.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-uri.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-value-utils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-version.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-websocket-connection.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-websocket.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-xmlrpc-old.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/soup-xmlrpc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-address.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-basic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-digest.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-domain-basic.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-domain-digest.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-domain.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-negotiate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth-ntlm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-auth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-body-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-body-output-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cache-client-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cache-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-client-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-connection-auth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-content-decoder.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-content-processor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-content-sniffer-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-content-sniffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-converter-wrapper.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-db.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-text.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cookie-jar.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-cookie.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-date.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-directory-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-enum-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-filter-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-form.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-headers.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-init.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-io-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-logger.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message-body.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message-client-io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message-headers.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message-io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message-queue.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message-server-io.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-message.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-method.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-misc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-multipart-input-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-multipart.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-password-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-path-map.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-wrapper.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-proxy-uri-resolver.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-request-data.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-request-file.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-request-http.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-request.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-requester.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-server.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-session-async.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-session-feature.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-session-sync.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-session.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-socket-properties.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-socket.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-status.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-tld.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-uri.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-value-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-version.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-websocket-connection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-websocket.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-xmlrpc-old.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_2_4_la-soup-xmlrpc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_gnome_2_4_la-soup-gnome-features.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_gnome_2_4_la-soup-password-manager-gnome.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -911,6 +1129,552 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< +libsoup_2_4_la-soup-address.lo: soup-address.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-address.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-address.Tpo -c -o libsoup_2_4_la-soup-address.lo `test -f 'soup-address.c' || echo '$(srcdir)/'`soup-address.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-address.Tpo $(DEPDIR)/libsoup_2_4_la-soup-address.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-address.c' object='libsoup_2_4_la-soup-address.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-address.lo `test -f 'soup-address.c' || echo '$(srcdir)/'`soup-address.c + +libsoup_2_4_la-soup-auth.lo: soup-auth.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth.Tpo -c -o libsoup_2_4_la-soup-auth.lo `test -f 'soup-auth.c' || echo '$(srcdir)/'`soup-auth.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth.c' object='libsoup_2_4_la-soup-auth.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth.lo `test -f 'soup-auth.c' || echo '$(srcdir)/'`soup-auth.c + +libsoup_2_4_la-soup-auth-basic.lo: soup-auth-basic.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-basic.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-basic.Tpo -c -o libsoup_2_4_la-soup-auth-basic.lo `test -f 'soup-auth-basic.c' || echo '$(srcdir)/'`soup-auth-basic.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-basic.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-basic.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-basic.c' object='libsoup_2_4_la-soup-auth-basic.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-basic.lo `test -f 'soup-auth-basic.c' || echo '$(srcdir)/'`soup-auth-basic.c + +libsoup_2_4_la-soup-auth-digest.lo: soup-auth-digest.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-digest.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-digest.Tpo -c -o libsoup_2_4_la-soup-auth-digest.lo `test -f 'soup-auth-digest.c' || echo '$(srcdir)/'`soup-auth-digest.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-digest.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-digest.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-digest.c' object='libsoup_2_4_la-soup-auth-digest.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-digest.lo `test -f 'soup-auth-digest.c' || echo '$(srcdir)/'`soup-auth-digest.c + +libsoup_2_4_la-soup-auth-ntlm.lo: soup-auth-ntlm.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-ntlm.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-ntlm.Tpo -c -o libsoup_2_4_la-soup-auth-ntlm.lo `test -f 'soup-auth-ntlm.c' || echo '$(srcdir)/'`soup-auth-ntlm.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-ntlm.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-ntlm.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-ntlm.c' object='libsoup_2_4_la-soup-auth-ntlm.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-ntlm.lo `test -f 'soup-auth-ntlm.c' || echo '$(srcdir)/'`soup-auth-ntlm.c + +libsoup_2_4_la-soup-auth-negotiate.lo: soup-auth-negotiate.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-negotiate.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-negotiate.Tpo -c -o libsoup_2_4_la-soup-auth-negotiate.lo `test -f 'soup-auth-negotiate.c' || echo '$(srcdir)/'`soup-auth-negotiate.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-negotiate.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-negotiate.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-negotiate.c' object='libsoup_2_4_la-soup-auth-negotiate.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-negotiate.lo `test -f 'soup-auth-negotiate.c' || echo '$(srcdir)/'`soup-auth-negotiate.c + +libsoup_2_4_la-soup-auth-domain.lo: soup-auth-domain.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-domain.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-domain.Tpo -c -o libsoup_2_4_la-soup-auth-domain.lo `test -f 'soup-auth-domain.c' || echo '$(srcdir)/'`soup-auth-domain.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-domain.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-domain.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-domain.c' object='libsoup_2_4_la-soup-auth-domain.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-domain.lo `test -f 'soup-auth-domain.c' || echo '$(srcdir)/'`soup-auth-domain.c + +libsoup_2_4_la-soup-auth-domain-basic.lo: soup-auth-domain-basic.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-domain-basic.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-domain-basic.Tpo -c -o libsoup_2_4_la-soup-auth-domain-basic.lo `test -f 'soup-auth-domain-basic.c' || echo '$(srcdir)/'`soup-auth-domain-basic.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-domain-basic.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-domain-basic.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-domain-basic.c' object='libsoup_2_4_la-soup-auth-domain-basic.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-domain-basic.lo `test -f 'soup-auth-domain-basic.c' || echo '$(srcdir)/'`soup-auth-domain-basic.c + +libsoup_2_4_la-soup-auth-domain-digest.lo: soup-auth-domain-digest.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-domain-digest.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-domain-digest.Tpo -c -o libsoup_2_4_la-soup-auth-domain-digest.lo `test -f 'soup-auth-domain-digest.c' || echo '$(srcdir)/'`soup-auth-domain-digest.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-domain-digest.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-domain-digest.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-domain-digest.c' object='libsoup_2_4_la-soup-auth-domain-digest.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-domain-digest.lo `test -f 'soup-auth-domain-digest.c' || echo '$(srcdir)/'`soup-auth-domain-digest.c + +libsoup_2_4_la-soup-auth-manager.lo: soup-auth-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-auth-manager.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-auth-manager.Tpo -c -o libsoup_2_4_la-soup-auth-manager.lo `test -f 'soup-auth-manager.c' || echo '$(srcdir)/'`soup-auth-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-auth-manager.Tpo $(DEPDIR)/libsoup_2_4_la-soup-auth-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-auth-manager.c' object='libsoup_2_4_la-soup-auth-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-auth-manager.lo `test -f 'soup-auth-manager.c' || echo '$(srcdir)/'`soup-auth-manager.c + +libsoup_2_4_la-soup-body-input-stream.lo: soup-body-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-body-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-body-input-stream.Tpo -c -o libsoup_2_4_la-soup-body-input-stream.lo `test -f 'soup-body-input-stream.c' || echo '$(srcdir)/'`soup-body-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-body-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-body-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-body-input-stream.c' object='libsoup_2_4_la-soup-body-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-body-input-stream.lo `test -f 'soup-body-input-stream.c' || echo '$(srcdir)/'`soup-body-input-stream.c + +libsoup_2_4_la-soup-body-output-stream.lo: soup-body-output-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-body-output-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-body-output-stream.Tpo -c -o libsoup_2_4_la-soup-body-output-stream.lo `test -f 'soup-body-output-stream.c' || echo '$(srcdir)/'`soup-body-output-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-body-output-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-body-output-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-body-output-stream.c' object='libsoup_2_4_la-soup-body-output-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-body-output-stream.lo `test -f 'soup-body-output-stream.c' || echo '$(srcdir)/'`soup-body-output-stream.c + +libsoup_2_4_la-soup-cache.lo: soup-cache.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cache.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cache.Tpo -c -o libsoup_2_4_la-soup-cache.lo `test -f 'soup-cache.c' || echo '$(srcdir)/'`soup-cache.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cache.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cache.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cache.c' object='libsoup_2_4_la-soup-cache.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cache.lo `test -f 'soup-cache.c' || echo '$(srcdir)/'`soup-cache.c + +libsoup_2_4_la-soup-cache-client-input-stream.lo: soup-cache-client-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cache-client-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cache-client-input-stream.Tpo -c -o libsoup_2_4_la-soup-cache-client-input-stream.lo `test -f 'soup-cache-client-input-stream.c' || echo '$(srcdir)/'`soup-cache-client-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cache-client-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cache-client-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cache-client-input-stream.c' object='libsoup_2_4_la-soup-cache-client-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cache-client-input-stream.lo `test -f 'soup-cache-client-input-stream.c' || echo '$(srcdir)/'`soup-cache-client-input-stream.c + +libsoup_2_4_la-soup-cache-input-stream.lo: soup-cache-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cache-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cache-input-stream.Tpo -c -o libsoup_2_4_la-soup-cache-input-stream.lo `test -f 'soup-cache-input-stream.c' || echo '$(srcdir)/'`soup-cache-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cache-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cache-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cache-input-stream.c' object='libsoup_2_4_la-soup-cache-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cache-input-stream.lo `test -f 'soup-cache-input-stream.c' || echo '$(srcdir)/'`soup-cache-input-stream.c + +libsoup_2_4_la-soup-client-input-stream.lo: soup-client-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-client-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-client-input-stream.Tpo -c -o libsoup_2_4_la-soup-client-input-stream.lo `test -f 'soup-client-input-stream.c' || echo '$(srcdir)/'`soup-client-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-client-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-client-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-client-input-stream.c' object='libsoup_2_4_la-soup-client-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-client-input-stream.lo `test -f 'soup-client-input-stream.c' || echo '$(srcdir)/'`soup-client-input-stream.c + +libsoup_2_4_la-soup-connection.lo: soup-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-connection.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-connection.Tpo -c -o libsoup_2_4_la-soup-connection.lo `test -f 'soup-connection.c' || echo '$(srcdir)/'`soup-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-connection.Tpo $(DEPDIR)/libsoup_2_4_la-soup-connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-connection.c' object='libsoup_2_4_la-soup-connection.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-connection.lo `test -f 'soup-connection.c' || echo '$(srcdir)/'`soup-connection.c + +libsoup_2_4_la-soup-connection-auth.lo: soup-connection-auth.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-connection-auth.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-connection-auth.Tpo -c -o libsoup_2_4_la-soup-connection-auth.lo `test -f 'soup-connection-auth.c' || echo '$(srcdir)/'`soup-connection-auth.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-connection-auth.Tpo $(DEPDIR)/libsoup_2_4_la-soup-connection-auth.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-connection-auth.c' object='libsoup_2_4_la-soup-connection-auth.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-connection-auth.lo `test -f 'soup-connection-auth.c' || echo '$(srcdir)/'`soup-connection-auth.c + +libsoup_2_4_la-soup-content-decoder.lo: soup-content-decoder.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-content-decoder.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-content-decoder.Tpo -c -o libsoup_2_4_la-soup-content-decoder.lo `test -f 'soup-content-decoder.c' || echo '$(srcdir)/'`soup-content-decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-content-decoder.Tpo $(DEPDIR)/libsoup_2_4_la-soup-content-decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-content-decoder.c' object='libsoup_2_4_la-soup-content-decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-content-decoder.lo `test -f 'soup-content-decoder.c' || echo '$(srcdir)/'`soup-content-decoder.c + +libsoup_2_4_la-soup-content-processor.lo: soup-content-processor.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-content-processor.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-content-processor.Tpo -c -o libsoup_2_4_la-soup-content-processor.lo `test -f 'soup-content-processor.c' || echo '$(srcdir)/'`soup-content-processor.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-content-processor.Tpo $(DEPDIR)/libsoup_2_4_la-soup-content-processor.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-content-processor.c' object='libsoup_2_4_la-soup-content-processor.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-content-processor.lo `test -f 'soup-content-processor.c' || echo '$(srcdir)/'`soup-content-processor.c + +libsoup_2_4_la-soup-content-sniffer.lo: soup-content-sniffer.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-content-sniffer.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-content-sniffer.Tpo -c -o libsoup_2_4_la-soup-content-sniffer.lo `test -f 'soup-content-sniffer.c' || echo '$(srcdir)/'`soup-content-sniffer.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-content-sniffer.Tpo $(DEPDIR)/libsoup_2_4_la-soup-content-sniffer.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-content-sniffer.c' object='libsoup_2_4_la-soup-content-sniffer.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-content-sniffer.lo `test -f 'soup-content-sniffer.c' || echo '$(srcdir)/'`soup-content-sniffer.c + +libsoup_2_4_la-soup-content-sniffer-stream.lo: soup-content-sniffer-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-content-sniffer-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-content-sniffer-stream.Tpo -c -o libsoup_2_4_la-soup-content-sniffer-stream.lo `test -f 'soup-content-sniffer-stream.c' || echo '$(srcdir)/'`soup-content-sniffer-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-content-sniffer-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-content-sniffer-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-content-sniffer-stream.c' object='libsoup_2_4_la-soup-content-sniffer-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-content-sniffer-stream.lo `test -f 'soup-content-sniffer-stream.c' || echo '$(srcdir)/'`soup-content-sniffer-stream.c + +libsoup_2_4_la-soup-converter-wrapper.lo: soup-converter-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-converter-wrapper.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-converter-wrapper.Tpo -c -o libsoup_2_4_la-soup-converter-wrapper.lo `test -f 'soup-converter-wrapper.c' || echo '$(srcdir)/'`soup-converter-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-converter-wrapper.Tpo $(DEPDIR)/libsoup_2_4_la-soup-converter-wrapper.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-converter-wrapper.c' object='libsoup_2_4_la-soup-converter-wrapper.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-converter-wrapper.lo `test -f 'soup-converter-wrapper.c' || echo '$(srcdir)/'`soup-converter-wrapper.c + +libsoup_2_4_la-soup-cookie.lo: soup-cookie.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cookie.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cookie.Tpo -c -o libsoup_2_4_la-soup-cookie.lo `test -f 'soup-cookie.c' || echo '$(srcdir)/'`soup-cookie.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cookie.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cookie.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cookie.c' object='libsoup_2_4_la-soup-cookie.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cookie.lo `test -f 'soup-cookie.c' || echo '$(srcdir)/'`soup-cookie.c + +libsoup_2_4_la-soup-cookie-jar.lo: soup-cookie-jar.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cookie-jar.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar.Tpo -c -o libsoup_2_4_la-soup-cookie-jar.lo `test -f 'soup-cookie-jar.c' || echo '$(srcdir)/'`soup-cookie-jar.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cookie-jar.c' object='libsoup_2_4_la-soup-cookie-jar.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cookie-jar.lo `test -f 'soup-cookie-jar.c' || echo '$(srcdir)/'`soup-cookie-jar.c + +libsoup_2_4_la-soup-cookie-jar-db.lo: soup-cookie-jar-db.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cookie-jar-db.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-db.Tpo -c -o libsoup_2_4_la-soup-cookie-jar-db.lo `test -f 'soup-cookie-jar-db.c' || echo '$(srcdir)/'`soup-cookie-jar-db.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-db.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-db.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cookie-jar-db.c' object='libsoup_2_4_la-soup-cookie-jar-db.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cookie-jar-db.lo `test -f 'soup-cookie-jar-db.c' || echo '$(srcdir)/'`soup-cookie-jar-db.c + +libsoup_2_4_la-soup-cookie-jar-text.lo: soup-cookie-jar-text.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-cookie-jar-text.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-text.Tpo -c -o libsoup_2_4_la-soup-cookie-jar-text.lo `test -f 'soup-cookie-jar-text.c' || echo '$(srcdir)/'`soup-cookie-jar-text.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-text.Tpo $(DEPDIR)/libsoup_2_4_la-soup-cookie-jar-text.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cookie-jar-text.c' object='libsoup_2_4_la-soup-cookie-jar-text.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-cookie-jar-text.lo `test -f 'soup-cookie-jar-text.c' || echo '$(srcdir)/'`soup-cookie-jar-text.c + +libsoup_2_4_la-soup-date.lo: soup-date.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-date.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-date.Tpo -c -o libsoup_2_4_la-soup-date.lo `test -f 'soup-date.c' || echo '$(srcdir)/'`soup-date.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-date.Tpo $(DEPDIR)/libsoup_2_4_la-soup-date.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-date.c' object='libsoup_2_4_la-soup-date.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-date.lo `test -f 'soup-date.c' || echo '$(srcdir)/'`soup-date.c + +libsoup_2_4_la-soup-directory-input-stream.lo: soup-directory-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-directory-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-directory-input-stream.Tpo -c -o libsoup_2_4_la-soup-directory-input-stream.lo `test -f 'soup-directory-input-stream.c' || echo '$(srcdir)/'`soup-directory-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-directory-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-directory-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-directory-input-stream.c' object='libsoup_2_4_la-soup-directory-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-directory-input-stream.lo `test -f 'soup-directory-input-stream.c' || echo '$(srcdir)/'`soup-directory-input-stream.c + +libsoup_2_4_la-soup-enum-types.lo: soup-enum-types.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-enum-types.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-enum-types.Tpo -c -o libsoup_2_4_la-soup-enum-types.lo `test -f 'soup-enum-types.c' || echo '$(srcdir)/'`soup-enum-types.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-enum-types.Tpo $(DEPDIR)/libsoup_2_4_la-soup-enum-types.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-enum-types.c' object='libsoup_2_4_la-soup-enum-types.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-enum-types.lo `test -f 'soup-enum-types.c' || echo '$(srcdir)/'`soup-enum-types.c + +libsoup_2_4_la-soup-filter-input-stream.lo: soup-filter-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-filter-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-filter-input-stream.Tpo -c -o libsoup_2_4_la-soup-filter-input-stream.lo `test -f 'soup-filter-input-stream.c' || echo '$(srcdir)/'`soup-filter-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-filter-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-filter-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-filter-input-stream.c' object='libsoup_2_4_la-soup-filter-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-filter-input-stream.lo `test -f 'soup-filter-input-stream.c' || echo '$(srcdir)/'`soup-filter-input-stream.c + +libsoup_2_4_la-soup-form.lo: soup-form.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-form.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-form.Tpo -c -o libsoup_2_4_la-soup-form.lo `test -f 'soup-form.c' || echo '$(srcdir)/'`soup-form.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-form.Tpo $(DEPDIR)/libsoup_2_4_la-soup-form.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-form.c' object='libsoup_2_4_la-soup-form.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-form.lo `test -f 'soup-form.c' || echo '$(srcdir)/'`soup-form.c + +libsoup_2_4_la-soup-headers.lo: soup-headers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-headers.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-headers.Tpo -c -o libsoup_2_4_la-soup-headers.lo `test -f 'soup-headers.c' || echo '$(srcdir)/'`soup-headers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-headers.Tpo $(DEPDIR)/libsoup_2_4_la-soup-headers.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-headers.c' object='libsoup_2_4_la-soup-headers.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-headers.lo `test -f 'soup-headers.c' || echo '$(srcdir)/'`soup-headers.c + +libsoup_2_4_la-soup-init.lo: soup-init.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-init.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-init.Tpo -c -o libsoup_2_4_la-soup-init.lo `test -f 'soup-init.c' || echo '$(srcdir)/'`soup-init.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-init.Tpo $(DEPDIR)/libsoup_2_4_la-soup-init.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-init.c' object='libsoup_2_4_la-soup-init.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-init.lo `test -f 'soup-init.c' || echo '$(srcdir)/'`soup-init.c + +libsoup_2_4_la-soup-io-stream.lo: soup-io-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-io-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-io-stream.Tpo -c -o libsoup_2_4_la-soup-io-stream.lo `test -f 'soup-io-stream.c' || echo '$(srcdir)/'`soup-io-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-io-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-io-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-io-stream.c' object='libsoup_2_4_la-soup-io-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-io-stream.lo `test -f 'soup-io-stream.c' || echo '$(srcdir)/'`soup-io-stream.c + +libsoup_2_4_la-soup-logger.lo: soup-logger.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-logger.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-logger.Tpo -c -o libsoup_2_4_la-soup-logger.lo `test -f 'soup-logger.c' || echo '$(srcdir)/'`soup-logger.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-logger.Tpo $(DEPDIR)/libsoup_2_4_la-soup-logger.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-logger.c' object='libsoup_2_4_la-soup-logger.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-logger.lo `test -f 'soup-logger.c' || echo '$(srcdir)/'`soup-logger.c + +libsoup_2_4_la-soup-message.lo: soup-message.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message.Tpo -c -o libsoup_2_4_la-soup-message.lo `test -f 'soup-message.c' || echo '$(srcdir)/'`soup-message.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message.c' object='libsoup_2_4_la-soup-message.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message.lo `test -f 'soup-message.c' || echo '$(srcdir)/'`soup-message.c + +libsoup_2_4_la-soup-message-body.lo: soup-message-body.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message-body.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message-body.Tpo -c -o libsoup_2_4_la-soup-message-body.lo `test -f 'soup-message-body.c' || echo '$(srcdir)/'`soup-message-body.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message-body.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message-body.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message-body.c' object='libsoup_2_4_la-soup-message-body.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message-body.lo `test -f 'soup-message-body.c' || echo '$(srcdir)/'`soup-message-body.c + +libsoup_2_4_la-soup-message-client-io.lo: soup-message-client-io.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message-client-io.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message-client-io.Tpo -c -o libsoup_2_4_la-soup-message-client-io.lo `test -f 'soup-message-client-io.c' || echo '$(srcdir)/'`soup-message-client-io.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message-client-io.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message-client-io.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message-client-io.c' object='libsoup_2_4_la-soup-message-client-io.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message-client-io.lo `test -f 'soup-message-client-io.c' || echo '$(srcdir)/'`soup-message-client-io.c + +libsoup_2_4_la-soup-message-headers.lo: soup-message-headers.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message-headers.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message-headers.Tpo -c -o libsoup_2_4_la-soup-message-headers.lo `test -f 'soup-message-headers.c' || echo '$(srcdir)/'`soup-message-headers.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message-headers.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message-headers.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message-headers.c' object='libsoup_2_4_la-soup-message-headers.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message-headers.lo `test -f 'soup-message-headers.c' || echo '$(srcdir)/'`soup-message-headers.c + +libsoup_2_4_la-soup-message-io.lo: soup-message-io.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message-io.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message-io.Tpo -c -o libsoup_2_4_la-soup-message-io.lo `test -f 'soup-message-io.c' || echo '$(srcdir)/'`soup-message-io.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message-io.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message-io.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message-io.c' object='libsoup_2_4_la-soup-message-io.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message-io.lo `test -f 'soup-message-io.c' || echo '$(srcdir)/'`soup-message-io.c + +libsoup_2_4_la-soup-message-queue.lo: soup-message-queue.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message-queue.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message-queue.Tpo -c -o libsoup_2_4_la-soup-message-queue.lo `test -f 'soup-message-queue.c' || echo '$(srcdir)/'`soup-message-queue.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message-queue.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message-queue.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message-queue.c' object='libsoup_2_4_la-soup-message-queue.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message-queue.lo `test -f 'soup-message-queue.c' || echo '$(srcdir)/'`soup-message-queue.c + +libsoup_2_4_la-soup-message-server-io.lo: soup-message-server-io.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-message-server-io.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-message-server-io.Tpo -c -o libsoup_2_4_la-soup-message-server-io.lo `test -f 'soup-message-server-io.c' || echo '$(srcdir)/'`soup-message-server-io.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-message-server-io.Tpo $(DEPDIR)/libsoup_2_4_la-soup-message-server-io.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-message-server-io.c' object='libsoup_2_4_la-soup-message-server-io.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-message-server-io.lo `test -f 'soup-message-server-io.c' || echo '$(srcdir)/'`soup-message-server-io.c + +libsoup_2_4_la-soup-method.lo: soup-method.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-method.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-method.Tpo -c -o libsoup_2_4_la-soup-method.lo `test -f 'soup-method.c' || echo '$(srcdir)/'`soup-method.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-method.Tpo $(DEPDIR)/libsoup_2_4_la-soup-method.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-method.c' object='libsoup_2_4_la-soup-method.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-method.lo `test -f 'soup-method.c' || echo '$(srcdir)/'`soup-method.c + +libsoup_2_4_la-soup-misc.lo: soup-misc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-misc.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-misc.Tpo -c -o libsoup_2_4_la-soup-misc.lo `test -f 'soup-misc.c' || echo '$(srcdir)/'`soup-misc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-misc.Tpo $(DEPDIR)/libsoup_2_4_la-soup-misc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-misc.c' object='libsoup_2_4_la-soup-misc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-misc.lo `test -f 'soup-misc.c' || echo '$(srcdir)/'`soup-misc.c + +libsoup_2_4_la-soup-multipart.lo: soup-multipart.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-multipart.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-multipart.Tpo -c -o libsoup_2_4_la-soup-multipart.lo `test -f 'soup-multipart.c' || echo '$(srcdir)/'`soup-multipart.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-multipart.Tpo $(DEPDIR)/libsoup_2_4_la-soup-multipart.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-multipart.c' object='libsoup_2_4_la-soup-multipart.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-multipart.lo `test -f 'soup-multipart.c' || echo '$(srcdir)/'`soup-multipart.c + +libsoup_2_4_la-soup-multipart-input-stream.lo: soup-multipart-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-multipart-input-stream.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-multipart-input-stream.Tpo -c -o libsoup_2_4_la-soup-multipart-input-stream.lo `test -f 'soup-multipart-input-stream.c' || echo '$(srcdir)/'`soup-multipart-input-stream.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-multipart-input-stream.Tpo $(DEPDIR)/libsoup_2_4_la-soup-multipart-input-stream.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-multipart-input-stream.c' object='libsoup_2_4_la-soup-multipart-input-stream.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-multipart-input-stream.lo `test -f 'soup-multipart-input-stream.c' || echo '$(srcdir)/'`soup-multipart-input-stream.c + +libsoup_2_4_la-soup-password-manager.lo: soup-password-manager.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-password-manager.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-password-manager.Tpo -c -o libsoup_2_4_la-soup-password-manager.lo `test -f 'soup-password-manager.c' || echo '$(srcdir)/'`soup-password-manager.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-password-manager.Tpo $(DEPDIR)/libsoup_2_4_la-soup-password-manager.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-password-manager.c' object='libsoup_2_4_la-soup-password-manager.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-password-manager.lo `test -f 'soup-password-manager.c' || echo '$(srcdir)/'`soup-password-manager.c + +libsoup_2_4_la-soup-path-map.lo: soup-path-map.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-path-map.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-path-map.Tpo -c -o libsoup_2_4_la-soup-path-map.lo `test -f 'soup-path-map.c' || echo '$(srcdir)/'`soup-path-map.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-path-map.Tpo $(DEPDIR)/libsoup_2_4_la-soup-path-map.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-path-map.c' object='libsoup_2_4_la-soup-path-map.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-path-map.lo `test -f 'soup-path-map.c' || echo '$(srcdir)/'`soup-path-map.c + +libsoup_2_4_la-soup-proxy-resolver.lo: soup-proxy-resolver.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-proxy-resolver.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver.Tpo -c -o libsoup_2_4_la-soup-proxy-resolver.lo `test -f 'soup-proxy-resolver.c' || echo '$(srcdir)/'`soup-proxy-resolver.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver.Tpo $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-proxy-resolver.c' object='libsoup_2_4_la-soup-proxy-resolver.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-proxy-resolver.lo `test -f 'soup-proxy-resolver.c' || echo '$(srcdir)/'`soup-proxy-resolver.c + +libsoup_2_4_la-soup-proxy-resolver-default.lo: soup-proxy-resolver-default.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-proxy-resolver-default.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-default.Tpo -c -o libsoup_2_4_la-soup-proxy-resolver-default.lo `test -f 'soup-proxy-resolver-default.c' || echo '$(srcdir)/'`soup-proxy-resolver-default.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-default.Tpo $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-default.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-proxy-resolver-default.c' object='libsoup_2_4_la-soup-proxy-resolver-default.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-proxy-resolver-default.lo `test -f 'soup-proxy-resolver-default.c' || echo '$(srcdir)/'`soup-proxy-resolver-default.c + +libsoup_2_4_la-soup-proxy-resolver-wrapper.lo: soup-proxy-resolver-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-proxy-resolver-wrapper.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-wrapper.Tpo -c -o libsoup_2_4_la-soup-proxy-resolver-wrapper.lo `test -f 'soup-proxy-resolver-wrapper.c' || echo '$(srcdir)/'`soup-proxy-resolver-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-wrapper.Tpo $(DEPDIR)/libsoup_2_4_la-soup-proxy-resolver-wrapper.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-proxy-resolver-wrapper.c' object='libsoup_2_4_la-soup-proxy-resolver-wrapper.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-proxy-resolver-wrapper.lo `test -f 'soup-proxy-resolver-wrapper.c' || echo '$(srcdir)/'`soup-proxy-resolver-wrapper.c + +libsoup_2_4_la-soup-proxy-uri-resolver.lo: soup-proxy-uri-resolver.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-proxy-uri-resolver.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-proxy-uri-resolver.Tpo -c -o libsoup_2_4_la-soup-proxy-uri-resolver.lo `test -f 'soup-proxy-uri-resolver.c' || echo '$(srcdir)/'`soup-proxy-uri-resolver.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-proxy-uri-resolver.Tpo $(DEPDIR)/libsoup_2_4_la-soup-proxy-uri-resolver.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-proxy-uri-resolver.c' object='libsoup_2_4_la-soup-proxy-uri-resolver.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-proxy-uri-resolver.lo `test -f 'soup-proxy-uri-resolver.c' || echo '$(srcdir)/'`soup-proxy-uri-resolver.c + +libsoup_2_4_la-soup-request.lo: soup-request.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-request.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-request.Tpo -c -o libsoup_2_4_la-soup-request.lo `test -f 'soup-request.c' || echo '$(srcdir)/'`soup-request.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-request.Tpo $(DEPDIR)/libsoup_2_4_la-soup-request.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-request.c' object='libsoup_2_4_la-soup-request.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-request.lo `test -f 'soup-request.c' || echo '$(srcdir)/'`soup-request.c + +libsoup_2_4_la-soup-request-data.lo: soup-request-data.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-request-data.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-request-data.Tpo -c -o libsoup_2_4_la-soup-request-data.lo `test -f 'soup-request-data.c' || echo '$(srcdir)/'`soup-request-data.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-request-data.Tpo $(DEPDIR)/libsoup_2_4_la-soup-request-data.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-request-data.c' object='libsoup_2_4_la-soup-request-data.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-request-data.lo `test -f 'soup-request-data.c' || echo '$(srcdir)/'`soup-request-data.c + +libsoup_2_4_la-soup-request-file.lo: soup-request-file.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-request-file.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-request-file.Tpo -c -o libsoup_2_4_la-soup-request-file.lo `test -f 'soup-request-file.c' || echo '$(srcdir)/'`soup-request-file.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-request-file.Tpo $(DEPDIR)/libsoup_2_4_la-soup-request-file.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-request-file.c' object='libsoup_2_4_la-soup-request-file.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-request-file.lo `test -f 'soup-request-file.c' || echo '$(srcdir)/'`soup-request-file.c + +libsoup_2_4_la-soup-request-http.lo: soup-request-http.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-request-http.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-request-http.Tpo -c -o libsoup_2_4_la-soup-request-http.lo `test -f 'soup-request-http.c' || echo '$(srcdir)/'`soup-request-http.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-request-http.Tpo $(DEPDIR)/libsoup_2_4_la-soup-request-http.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-request-http.c' object='libsoup_2_4_la-soup-request-http.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-request-http.lo `test -f 'soup-request-http.c' || echo '$(srcdir)/'`soup-request-http.c + +libsoup_2_4_la-soup-requester.lo: soup-requester.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-requester.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-requester.Tpo -c -o libsoup_2_4_la-soup-requester.lo `test -f 'soup-requester.c' || echo '$(srcdir)/'`soup-requester.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-requester.Tpo $(DEPDIR)/libsoup_2_4_la-soup-requester.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-requester.c' object='libsoup_2_4_la-soup-requester.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-requester.lo `test -f 'soup-requester.c' || echo '$(srcdir)/'`soup-requester.c + +libsoup_2_4_la-soup-server.lo: soup-server.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-server.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-server.Tpo -c -o libsoup_2_4_la-soup-server.lo `test -f 'soup-server.c' || echo '$(srcdir)/'`soup-server.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-server.Tpo $(DEPDIR)/libsoup_2_4_la-soup-server.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-server.c' object='libsoup_2_4_la-soup-server.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-server.lo `test -f 'soup-server.c' || echo '$(srcdir)/'`soup-server.c + +libsoup_2_4_la-soup-session.lo: soup-session.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-session.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-session.Tpo -c -o libsoup_2_4_la-soup-session.lo `test -f 'soup-session.c' || echo '$(srcdir)/'`soup-session.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-session.Tpo $(DEPDIR)/libsoup_2_4_la-soup-session.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-session.c' object='libsoup_2_4_la-soup-session.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-session.lo `test -f 'soup-session.c' || echo '$(srcdir)/'`soup-session.c + +libsoup_2_4_la-soup-session-async.lo: soup-session-async.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-session-async.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-session-async.Tpo -c -o libsoup_2_4_la-soup-session-async.lo `test -f 'soup-session-async.c' || echo '$(srcdir)/'`soup-session-async.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-session-async.Tpo $(DEPDIR)/libsoup_2_4_la-soup-session-async.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-session-async.c' object='libsoup_2_4_la-soup-session-async.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-session-async.lo `test -f 'soup-session-async.c' || echo '$(srcdir)/'`soup-session-async.c + +libsoup_2_4_la-soup-session-feature.lo: soup-session-feature.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-session-feature.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-session-feature.Tpo -c -o libsoup_2_4_la-soup-session-feature.lo `test -f 'soup-session-feature.c' || echo '$(srcdir)/'`soup-session-feature.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-session-feature.Tpo $(DEPDIR)/libsoup_2_4_la-soup-session-feature.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-session-feature.c' object='libsoup_2_4_la-soup-session-feature.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-session-feature.lo `test -f 'soup-session-feature.c' || echo '$(srcdir)/'`soup-session-feature.c + +libsoup_2_4_la-soup-session-sync.lo: soup-session-sync.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-session-sync.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-session-sync.Tpo -c -o libsoup_2_4_la-soup-session-sync.lo `test -f 'soup-session-sync.c' || echo '$(srcdir)/'`soup-session-sync.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-session-sync.Tpo $(DEPDIR)/libsoup_2_4_la-soup-session-sync.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-session-sync.c' object='libsoup_2_4_la-soup-session-sync.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-session-sync.lo `test -f 'soup-session-sync.c' || echo '$(srcdir)/'`soup-session-sync.c + +libsoup_2_4_la-soup-socket.lo: soup-socket.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-socket.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-socket.Tpo -c -o libsoup_2_4_la-soup-socket.lo `test -f 'soup-socket.c' || echo '$(srcdir)/'`soup-socket.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-socket.Tpo $(DEPDIR)/libsoup_2_4_la-soup-socket.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-socket.c' object='libsoup_2_4_la-soup-socket.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-socket.lo `test -f 'soup-socket.c' || echo '$(srcdir)/'`soup-socket.c + +libsoup_2_4_la-soup-socket-properties.lo: soup-socket-properties.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-socket-properties.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-socket-properties.Tpo -c -o libsoup_2_4_la-soup-socket-properties.lo `test -f 'soup-socket-properties.c' || echo '$(srcdir)/'`soup-socket-properties.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-socket-properties.Tpo $(DEPDIR)/libsoup_2_4_la-soup-socket-properties.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-socket-properties.c' object='libsoup_2_4_la-soup-socket-properties.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-socket-properties.lo `test -f 'soup-socket-properties.c' || echo '$(srcdir)/'`soup-socket-properties.c + +libsoup_2_4_la-soup-status.lo: soup-status.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-status.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-status.Tpo -c -o libsoup_2_4_la-soup-status.lo `test -f 'soup-status.c' || echo '$(srcdir)/'`soup-status.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-status.Tpo $(DEPDIR)/libsoup_2_4_la-soup-status.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-status.c' object='libsoup_2_4_la-soup-status.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-status.lo `test -f 'soup-status.c' || echo '$(srcdir)/'`soup-status.c + +libsoup_2_4_la-soup-tld.lo: soup-tld.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-tld.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-tld.Tpo -c -o libsoup_2_4_la-soup-tld.lo `test -f 'soup-tld.c' || echo '$(srcdir)/'`soup-tld.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-tld.Tpo $(DEPDIR)/libsoup_2_4_la-soup-tld.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-tld.c' object='libsoup_2_4_la-soup-tld.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-tld.lo `test -f 'soup-tld.c' || echo '$(srcdir)/'`soup-tld.c + +libsoup_2_4_la-soup-uri.lo: soup-uri.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-uri.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-uri.Tpo -c -o libsoup_2_4_la-soup-uri.lo `test -f 'soup-uri.c' || echo '$(srcdir)/'`soup-uri.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-uri.Tpo $(DEPDIR)/libsoup_2_4_la-soup-uri.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-uri.c' object='libsoup_2_4_la-soup-uri.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-uri.lo `test -f 'soup-uri.c' || echo '$(srcdir)/'`soup-uri.c + +libsoup_2_4_la-soup-value-utils.lo: soup-value-utils.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-value-utils.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-value-utils.Tpo -c -o libsoup_2_4_la-soup-value-utils.lo `test -f 'soup-value-utils.c' || echo '$(srcdir)/'`soup-value-utils.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-value-utils.Tpo $(DEPDIR)/libsoup_2_4_la-soup-value-utils.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-value-utils.c' object='libsoup_2_4_la-soup-value-utils.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-value-utils.lo `test -f 'soup-value-utils.c' || echo '$(srcdir)/'`soup-value-utils.c + +libsoup_2_4_la-soup-version.lo: soup-version.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-version.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-version.Tpo -c -o libsoup_2_4_la-soup-version.lo `test -f 'soup-version.c' || echo '$(srcdir)/'`soup-version.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-version.Tpo $(DEPDIR)/libsoup_2_4_la-soup-version.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-version.c' object='libsoup_2_4_la-soup-version.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-version.lo `test -f 'soup-version.c' || echo '$(srcdir)/'`soup-version.c + +libsoup_2_4_la-soup-websocket.lo: soup-websocket.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-websocket.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-websocket.Tpo -c -o libsoup_2_4_la-soup-websocket.lo `test -f 'soup-websocket.c' || echo '$(srcdir)/'`soup-websocket.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-websocket.Tpo $(DEPDIR)/libsoup_2_4_la-soup-websocket.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-websocket.c' object='libsoup_2_4_la-soup-websocket.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-websocket.lo `test -f 'soup-websocket.c' || echo '$(srcdir)/'`soup-websocket.c + +libsoup_2_4_la-soup-websocket-connection.lo: soup-websocket-connection.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-websocket-connection.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-websocket-connection.Tpo -c -o libsoup_2_4_la-soup-websocket-connection.lo `test -f 'soup-websocket-connection.c' || echo '$(srcdir)/'`soup-websocket-connection.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-websocket-connection.Tpo $(DEPDIR)/libsoup_2_4_la-soup-websocket-connection.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-websocket-connection.c' object='libsoup_2_4_la-soup-websocket-connection.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-websocket-connection.lo `test -f 'soup-websocket-connection.c' || echo '$(srcdir)/'`soup-websocket-connection.c + +libsoup_2_4_la-soup-xmlrpc.lo: soup-xmlrpc.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-xmlrpc.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-xmlrpc.Tpo -c -o libsoup_2_4_la-soup-xmlrpc.lo `test -f 'soup-xmlrpc.c' || echo '$(srcdir)/'`soup-xmlrpc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-xmlrpc.Tpo $(DEPDIR)/libsoup_2_4_la-soup-xmlrpc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-xmlrpc.c' object='libsoup_2_4_la-soup-xmlrpc.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-xmlrpc.lo `test -f 'soup-xmlrpc.c' || echo '$(srcdir)/'`soup-xmlrpc.c + +libsoup_2_4_la-soup-xmlrpc-old.lo: soup-xmlrpc-old.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_2_4_la-soup-xmlrpc-old.lo -MD -MP -MF $(DEPDIR)/libsoup_2_4_la-soup-xmlrpc-old.Tpo -c -o libsoup_2_4_la-soup-xmlrpc-old.lo `test -f 'soup-xmlrpc-old.c' || echo '$(srcdir)/'`soup-xmlrpc-old.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_2_4_la-soup-xmlrpc-old.Tpo $(DEPDIR)/libsoup_2_4_la-soup-xmlrpc-old.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-xmlrpc-old.c' object='libsoup_2_4_la-soup-xmlrpc-old.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_2_4_la-soup-xmlrpc-old.lo `test -f 'soup-xmlrpc-old.c' || echo '$(srcdir)/'`soup-xmlrpc-old.c + +libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.lo: soup-cookie-jar-sqlite.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.lo -MD -MP -MF $(DEPDIR)/libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.Tpo -c -o libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.lo `test -f 'soup-cookie-jar-sqlite.c' || echo '$(srcdir)/'`soup-cookie-jar-sqlite.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.Tpo $(DEPDIR)/libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-cookie-jar-sqlite.c' object='libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_gnome_2_4_la-soup-cookie-jar-sqlite.lo `test -f 'soup-cookie-jar-sqlite.c' || echo '$(srcdir)/'`soup-cookie-jar-sqlite.c + +libsoup_gnome_2_4_la-soup-gnome-features.lo: soup-gnome-features.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_gnome_2_4_la-soup-gnome-features.lo -MD -MP -MF $(DEPDIR)/libsoup_gnome_2_4_la-soup-gnome-features.Tpo -c -o libsoup_gnome_2_4_la-soup-gnome-features.lo `test -f 'soup-gnome-features.c' || echo '$(srcdir)/'`soup-gnome-features.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_gnome_2_4_la-soup-gnome-features.Tpo $(DEPDIR)/libsoup_gnome_2_4_la-soup-gnome-features.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-gnome-features.c' object='libsoup_gnome_2_4_la-soup-gnome-features.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_gnome_2_4_la-soup-gnome-features.lo `test -f 'soup-gnome-features.c' || echo '$(srcdir)/'`soup-gnome-features.c + +libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.lo: soup-proxy-resolver-gnome.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.lo -MD -MP -MF $(DEPDIR)/libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.Tpo -c -o libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.lo `test -f 'soup-proxy-resolver-gnome.c' || echo '$(srcdir)/'`soup-proxy-resolver-gnome.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.Tpo $(DEPDIR)/libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-proxy-resolver-gnome.c' object='libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_gnome_2_4_la-soup-proxy-resolver-gnome.lo `test -f 'soup-proxy-resolver-gnome.c' || echo '$(srcdir)/'`soup-proxy-resolver-gnome.c + +libsoup_gnome_2_4_la-soup-password-manager-gnome.lo: soup-password-manager-gnome.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -MT libsoup_gnome_2_4_la-soup-password-manager-gnome.lo -MD -MP -MF $(DEPDIR)/libsoup_gnome_2_4_la-soup-password-manager-gnome.Tpo -c -o libsoup_gnome_2_4_la-soup-password-manager-gnome.lo `test -f 'soup-password-manager-gnome.c' || echo '$(srcdir)/'`soup-password-manager-gnome.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libsoup_gnome_2_4_la-soup-password-manager-gnome.Tpo $(DEPDIR)/libsoup_gnome_2_4_la-soup-password-manager-gnome.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='soup-password-manager-gnome.c' object='libsoup_gnome_2_4_la-soup-password-manager-gnome.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsoup_gnome_2_4_la_CFLAGS) $(CFLAGS) -c -o libsoup_gnome_2_4_la-soup-password-manager-gnome.lo `test -f 'soup-password-manager-gnome.c' || echo '$(srcdir)/'`soup-password-manager-gnome.c + mostlyclean-libtool: -rm -f *.lo @@ -1125,9 +1889,10 @@ || exit 1; \ fi; \ done -@OS_LINUX_FALSE@check-local: + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" distdir="$(distdir)" \ + dist-hook check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) @@ -1246,17 +2011,17 @@ uninstall-nodist_libsoupincludeHEADERS uninstall-typelibDATA \ uninstall-vapiDATA -.MAKE: all check check-am install install-am install-strip +.MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ - clean-generic clean-libLTLIBRARIES clean-libtool cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-girDATA install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-libsoupgnomeincludeHEADERS \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ + ctags-am dist-hook distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-girDATA install-html \ + install-html-am install-info install-info-am \ + install-libLTLIBRARIES install-libsoupgnomeincludeHEADERS \ install-libsoupincludeHEADERS install-man \ install-nodist_libsoupincludeHEADERS install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ @@ -1270,6 +2035,8 @@ uninstall-nodist_libsoupincludeHEADERS uninstall-typelibDATA \ uninstall-vapiDATA +.PRECIOUS: Makefile + include $(GLIB_MAKEFILE) @@ -1287,15 +2054,130 @@ @ENABLE_VAPIGEN_TRUE@@HAVE_INTROSPECTION_TRUE@ $(VAPIGEN) --metadatadir=$(top_srcdir)/libsoup --pkg gio-2.0 --library=libsoup-2.4 $^ @BUILD_LIBSOUP_GNOME_TRUE@@HAVE_INTROSPECTION_TRUE@SoupGNOME-2.4.gir: libsoup-gnome-2.4.la Soup-2.4.gir -# We only do this check on Linux, so we don't have to worry about -# different "nm" output on other platforms -@OS_LINUX_TRUE@check-local: -@OS_LINUX_TRUE@ @echo Checking libsoup-2.4.so symbols -@OS_LINUX_TRUE@ @nm $(builddir)/.libs/libsoup-2.4.so | \ -@OS_LINUX_TRUE@ grep "^[[:xdigit:]]\+ [BGTRS] " | \ -@OS_LINUX_TRUE@ sed "s/^[[:xdigit:]]\+ [BGTRS] //" | \ -@OS_LINUX_TRUE@ env LC_ALL=C sort -u | \ -@OS_LINUX_TRUE@ diff -U0 $(srcdir)/libsoup-2.4.sym - >&2 +# +# Creates Visual Studio 2008/2010 projects from items passed in from autotools files +# $(1) - Base Name of the MSVC project files (outputs) +# + +define msvcproj-builder + +$(top_builddir)/build/win32/vs10/$(1).vcxproj: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(1).sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles: $(top_builddir)/build/win32/vs9/$(1).vcproj +$(1).vs10.sourcefiles.filters: $(top_builddir)/build/win32/vs9/$(1).vcproj + +$(top_builddir)/build/win32/vs9/$(1).vcproj: + -$(RM) $(top_builddir)/build/win32/vs9/$(1).vcproj + -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj + -$(RM) $(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + + for F in $(_proj_files); do \ + case $$$$F in \ + $(_proj_filters)) \ + ;; \ + *.c|*.cpp|*.cc|*.cxx) \ + echo ' ' >>$(1).sourcefiles && \ + echo ' ' >>$(1).vs10.sourcefiles && \ + echo ' Source Files' >>$(1).vs10.sourcefiles.filters \ + ;; \ + esac; \ + done + + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/$(1).vcprojin >$(top_builddir)/build/win32/vs9/$(1).vcproj + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxprojin >$(top_builddir)/build/win32/vs10/$(1).vcxproj + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/$(1).vcxproj.filtersin >$(top_builddir)/build/win32/vs10/$(1).vcxproj.filters + $(RM) $(1).sourcefiles + $(RM) $(1).vs10.sourcefiles + $(RM) $(1).vs10.sourcefiles.filters + +$(top_builddir)/build/win32/vs10/$(1).vs10.headers: $(top_builddir)/build/win32/vs9/$(1).headers + +$(top_builddir)/build/win32/vs9/$(1).headers: + -$(RM) $(top_builddir)/build/win32/vs9/$(1).headers + -$(RM) $(top_builddir)/build/win32/vs10/$(1).vs10.headers + + for F in $(_proj_headers); do \ + case $$$$F in \ + $(_proj_headers_excludes)) \ + ;; \ + *.h|*.hpp|*.hh|*.hxx) \ + echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F' ' >>$(top_builddir)/build/win32/vs9/$(1).headers && \ + echo 'copy ..\..\..'$(_proj_subdir)$$$$F' $$$$(CopyDir)\include'$(_headers_destdir)'\'$$$$F >>$(top_builddir)/build/win32/vs10/$(1).vs10.headers \ + ;; \ + esac; \ + done + +endef + +$(foreach proj,$(MSVCPROJS),$(eval $(call msvcproj-builder,$(proj)))) + +# +# Create NMake Makefile Sections for Building Introspection files +# from autotools files +# $(1) - File Name of the .gir that is to be generated +# + +@HAVE_INTROSPECTION_TRUE@define gir-nmake-builder + +# Basic sanity check, to make sure required variables are set +@HAVE_INTROSPECTION_TRUE@$(if $($(_gir_name)_MSVC_FILES),,$(error Need to define $(_gir_name)_MSVC_FILES)) +@HAVE_INTROSPECTION_TRUE@$(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)), +@HAVE_INTROSPECTION_TRUE@ $($(_gir_name)_MSVC_LIBS), +@HAVE_INTROSPECTION_TRUE@ $($(_gir_name)_MSVC_PROGRAM)),, +@HAVE_INTROSPECTION_TRUE@ $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM)) + +@HAVE_INTROSPECTION_TRUE@$(top_builddir)/build/win32/$(_gir_name)_list: +@HAVE_INTROSPECTION_TRUE@ for F in $(_gir_files_msvc); do \ +@HAVE_INTROSPECTION_TRUE@ case $$$$F in \ +@HAVE_INTROSPECTION_TRUE@ *.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \ +@HAVE_INTROSPECTION_TRUE@ echo '..\..'$(_gir_source_subdir_msvc)$$$$F >>$(top_builddir)/build/win32/$(_gir_name)_list \ +@HAVE_INTROSPECTION_TRUE@ ;; \ +@HAVE_INTROSPECTION_TRUE@ esac; \ +@HAVE_INTROSPECTION_TRUE@ done + +@HAVE_INTROSPECTION_TRUE@$(top_builddir)/build/win32/$(1).msvc.introspect: +@HAVE_INTROSPECTION_TRUE@ -$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect + +# Assemble the Command to Run g-ir-scanner +@HAVE_INTROSPECTION_TRUE@ echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --namespace='$(_gir_namespace_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --nsversion='$(_gir_version_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --cflags-begin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$($(_gir_name)_MSVC_CFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --cflags-end \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$($(_gir_name)_MSVC_SCANNERFLAGS)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --filelist='$(_gir_name)'_list \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect + +# Finally Assemble the Command to Compile the generated .gir +@HAVE_INTROSPECTION_TRUE@ echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@ echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect +@HAVE_INTROSPECTION_TRUE@endef + +@HAVE_INTROSPECTION_TRUE@$(foreach gir,$(MSVC_INTROSPECT_GIRS),$(eval $(call gir-nmake-builder,$(gir)))) + +dist-hook: \ + $(top_builddir)/build/win32/vs9/soup.vcproj \ + $(top_builddir)/build/win32/vs9/soup.headers \ + $(top_builddir)/build/win32/vs9/soup-gnome.vcproj \ + $(top_builddir)/build/win32/vs9/soup-gnome.headers \ + $(INTROSPECTION_INTERMEDIATE_ITEMS) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -Nru libsoup2.4-2.52.2/libsoup/soup-address.h libsoup2.4-2.54.1/libsoup/soup-address.h --- libsoup2.4-2.52.2/libsoup/soup-address.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-address.h 2016-02-19 14:15:46.000000000 +0000 @@ -56,30 +56,41 @@ guint status, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 GType soup_address_get_type (void); +SOUP_AVAILABLE_IN_2_4 SoupAddress *soup_address_new (const char *name, guint port); +SOUP_AVAILABLE_IN_2_4 SoupAddress *soup_address_new_from_sockaddr (struct sockaddr *sa, int len); +SOUP_AVAILABLE_IN_2_4 SoupAddress *soup_address_new_any (SoupAddressFamily family, guint port); +SOUP_AVAILABLE_IN_2_4 void soup_address_resolve_async (SoupAddress *addr, GMainContext *async_context, GCancellable *cancellable, SoupAddressCallback callback, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 guint soup_address_resolve_sync (SoupAddress *addr, GCancellable *cancellable); +SOUP_AVAILABLE_IN_2_4 const char *soup_address_get_name (SoupAddress *addr); +SOUP_AVAILABLE_IN_2_4 const char *soup_address_get_physical (SoupAddress *addr); +SOUP_AVAILABLE_IN_2_4 guint soup_address_get_port (SoupAddress *addr); +SOUP_AVAILABLE_IN_2_4 struct sockaddr *soup_address_get_sockaddr (SoupAddress *addr, int *len); SOUP_AVAILABLE_IN_2_32 GSocketAddress *soup_address_get_gsockaddr (SoupAddress *addr); +SOUP_AVAILABLE_IN_2_4 gboolean soup_address_is_resolved (SoupAddress *addr); SOUP_AVAILABLE_IN_2_26 diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth.c libsoup2.4-2.54.1/libsoup/soup-auth.c --- libsoup2.4-2.52.2/libsoup/soup-auth.c 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth.c 2016-03-14 16:19:35.000000000 +0000 @@ -129,6 +129,11 @@ } } +static gboolean +auth_can_authenticate (SoupAuth *auth) +{ + return TRUE; +} static void soup_auth_class_init (SoupAuthClass *auth_class) @@ -137,6 +142,8 @@ g_type_class_add_private (auth_class, sizeof (SoupAuthPrivate)); + auth_class->can_authenticate = auth_can_authenticate; + object_class->finalize = soup_auth_finalize; object_class->set_property = soup_auth_set_property; object_class->get_property = soup_auth_get_property; @@ -491,6 +498,25 @@ } /** + * soup_auth_can_authenticate: + * @auth: a #SoupAuth + * + * Tests if @auth is able to authenticate by providing credentials to the + * soup_auth_authenticate(). + * + * Return value: %TRUE if @auth is able to accept credentials. + * + * Since: 2.54 + **/ +gboolean +soup_auth_can_authenticate (SoupAuth *auth) +{ + g_return_val_if_fail (SOUP_IS_AUTH (auth), FALSE); + + return SOUP_AUTH_GET_CLASS (auth)->can_authenticate (auth); +} + +/** * soup_auth_get_protection_space: * @auth: a #SoupAuth * @source_uri: the URI of the request that @auth was generated in diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-domain-basic.h libsoup2.4-2.54.1/libsoup/soup-auth-domain-basic.h --- libsoup2.4-2.52.2/libsoup/soup-auth-domain-basic.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-domain-basic.h 2016-02-19 14:15:46.000000000 +0000 @@ -35,8 +35,10 @@ #define SOUP_AUTH_DOMAIN_BASIC_AUTH_CALLBACK "auth-callback" #define SOUP_AUTH_DOMAIN_BASIC_AUTH_DATA "auth-data" +SOUP_AVAILABLE_IN_2_4 GType soup_auth_domain_basic_get_type (void); +SOUP_AVAILABLE_IN_2_4 SoupAuthDomain *soup_auth_domain_basic_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; @@ -46,6 +48,7 @@ const char *password, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_basic_set_auth_callback (SoupAuthDomain *domain, SoupAuthDomainBasicAuthCallback callback, gpointer user_data, diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-domain-digest.h libsoup2.4-2.54.1/libsoup/soup-auth-domain-digest.h --- libsoup2.4-2.52.2/libsoup/soup-auth-domain-digest.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-domain-digest.h 2016-02-19 14:15:46.000000000 +0000 @@ -35,8 +35,10 @@ #define SOUP_AUTH_DOMAIN_DIGEST_AUTH_CALLBACK "auth-callback" #define SOUP_AUTH_DOMAIN_DIGEST_AUTH_DATA "auth-data" +SOUP_AVAILABLE_IN_2_4 GType soup_auth_domain_digest_get_type (void); +SOUP_AVAILABLE_IN_2_4 SoupAuthDomain *soup_auth_domain_digest_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; @@ -45,11 +47,13 @@ const char *username, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_digest_set_auth_callback (SoupAuthDomain *domain, SoupAuthDomainDigestAuthCallback callback, gpointer user_data, GDestroyNotify dnotify); +SOUP_AVAILABLE_IN_2_4 char *soup_auth_domain_digest_encode_password (const char *username, const char *realm, const char *password); diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-domain.h libsoup2.4-2.54.1/libsoup/soup-auth-domain.h --- libsoup2.4-2.52.2/libsoup/soup-auth-domain.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-domain.h 2016-02-19 14:15:46.000000000 +0000 @@ -59,37 +59,48 @@ const char *username, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 GType soup_auth_domain_get_type (void); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_add_path (SoupAuthDomain *domain, const char *path); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_remove_path (SoupAuthDomain *domain, const char *path); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_set_filter (SoupAuthDomain *domain, SoupAuthDomainFilter filter, gpointer filter_data, GDestroyNotify dnotify); +SOUP_AVAILABLE_IN_2_4 const char *soup_auth_domain_get_realm (SoupAuthDomain *domain); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_set_generic_auth_callback (SoupAuthDomain *domain, SoupAuthDomainGenericAuthCallback auth_callback, gpointer auth_data, GDestroyNotify dnotify); +SOUP_AVAILABLE_IN_2_4 gboolean soup_auth_domain_check_password (SoupAuthDomain *domain, SoupMessage *msg, const char *username, const char *password); +SOUP_AVAILABLE_IN_2_4 gboolean soup_auth_domain_covers (SoupAuthDomain *domain, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 char *soup_auth_domain_accepts (SoupAuthDomain *domain, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_auth_domain_challenge (SoupAuthDomain *domain, SoupMessage *msg); /* protected */ +SOUP_AVAILABLE_IN_2_4 gboolean soup_auth_domain_try_generic_auth_callback (SoupAuthDomain *domain, SoupMessage *msg, const char *username); diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth.h libsoup2.4-2.54.1/libsoup/soup-auth.h --- libsoup2.4-2.52.2/libsoup/soup-auth.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth.h 2016-04-25 15:17:57.000000000 +0000 @@ -48,8 +48,9 @@ gboolean (*is_ready) (SoupAuth *auth, SoupMessage *msg); + gboolean (*can_authenticate) (SoupAuth *auth); + /* Padding for future expansion */ - void (*_libsoup_reserved2) (void); void (*_libsoup_reserved3) (void); void (*_libsoup_reserved4) (void); } SoupAuthClass; @@ -60,45 +61,66 @@ #define SOUP_AUTH_IS_FOR_PROXY "is-for-proxy" #define SOUP_AUTH_IS_AUTHENTICATED "is-authenticated" +SOUP_AVAILABLE_IN_2_4 GType soup_auth_get_type (void); +SOUP_AVAILABLE_IN_2_4 SoupAuth *soup_auth_new (GType type, SoupMessage *msg, const char *auth_header); +SOUP_AVAILABLE_IN_2_4 gboolean soup_auth_update (SoupAuth *auth, SoupMessage *msg, const char *auth_header); +SOUP_AVAILABLE_IN_2_4 gboolean soup_auth_is_for_proxy (SoupAuth *auth); +SOUP_AVAILABLE_IN_2_4 const char *soup_auth_get_scheme_name (SoupAuth *auth); +SOUP_AVAILABLE_IN_2_4 const char *soup_auth_get_host (SoupAuth *auth); +SOUP_AVAILABLE_IN_2_4 const char *soup_auth_get_realm (SoupAuth *auth); +SOUP_AVAILABLE_IN_2_4 char *soup_auth_get_info (SoupAuth *auth); +SOUP_AVAILABLE_IN_2_4 void soup_auth_authenticate (SoupAuth *auth, const char *username, const char *password); +SOUP_AVAILABLE_IN_2_4 gboolean soup_auth_is_authenticated (SoupAuth *auth); SOUP_AVAILABLE_IN_2_42 gboolean soup_auth_is_ready (SoupAuth *auth, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_54 +gboolean soup_auth_can_authenticate (SoupAuth *auth); +SOUP_AVAILABLE_IN_2_4 char *soup_auth_get_authorization (SoupAuth *auth, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 GSList *soup_auth_get_protection_space (SoupAuth *auth, SoupURI *source_uri); +SOUP_AVAILABLE_IN_2_4 void soup_auth_free_protection_space (SoupAuth *auth, GSList *space); /* The actual auth types, which can be added/removed as features */ #define SOUP_TYPE_AUTH_BASIC (soup_auth_basic_get_type ()) +SOUP_AVAILABLE_IN_2_4 GType soup_auth_basic_get_type (void); #define SOUP_TYPE_AUTH_DIGEST (soup_auth_digest_get_type ()) +SOUP_AVAILABLE_IN_2_4 GType soup_auth_digest_get_type (void); #define SOUP_TYPE_AUTH_NTLM (soup_auth_ntlm_get_type ()) +SOUP_AVAILABLE_IN_2_4 GType soup_auth_ntlm_get_type (void); +#define SOUP_TYPE_AUTH_NEGOTIATE (soup_auth_negotiate_get_type ()) +SOUP_AVAILABLE_IN_2_54 +GType soup_auth_negotiate_get_type (void); /* Deprecated SoupPasswordManager-related APIs: all are now no-ops */ SOUP_AVAILABLE_IN_2_28 @@ -119,6 +141,9 @@ const char *username, const char *password); +SOUP_AVAILABLE_IN_2_54 +gboolean soup_auth_negotiate_supported (void); + G_END_DECLS #endif /* SOUP_AUTH_H */ diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-manager.c libsoup2.4-2.54.1/libsoup/soup-auth-manager.c --- libsoup2.4-2.52.2/libsoup/soup-auth-manager.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-manager.c 2016-03-14 16:19:35.000000000 +0000 @@ -190,7 +190,7 @@ { SoupAuthManagerPrivate *priv = SOUP_AUTH_MANAGER (feature)->priv; SoupAuthClass *auth_class; - int i; + guint i; if (!g_type_is_a (type, SOUP_TYPE_AUTH)) return FALSE; @@ -215,7 +215,7 @@ { SoupAuthManagerPrivate *priv = SOUP_AUTH_MANAGER (feature)->priv; SoupAuthClass *auth_class; - int i; + guint i; if (!g_type_is_a (type, SOUP_TYPE_AUTH)) return FALSE; @@ -468,6 +468,9 @@ SoupAuthManagerPrivate *priv = manager->priv; SoupURI *uri; + if (!soup_auth_can_authenticate (auth)) + return; + if (proxy) { SoupMessageQueue *queue; SoupMessageQueueItem *item; diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-manager.h libsoup2.4-2.54.1/libsoup/soup-auth-manager.h --- libsoup2.4-2.52.2/libsoup/soup-auth-manager.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-manager.h 2016-02-19 14:15:46.000000000 +0000 @@ -33,8 +33,10 @@ SoupAuth *auth, gboolean retrying); } SoupAuthManagerClass; +SOUP_AVAILABLE_IN_2_4 GType soup_auth_manager_get_type (void); +SOUP_AVAILABLE_IN_2_4 void soup_auth_manager_use_auth (SoupAuthManager *manager, SoupURI *uri, SoupAuth *auth); diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-negotiate.c libsoup2.4-2.54.1/libsoup/soup-auth-negotiate.c --- libsoup2.4-2.52.2/libsoup/soup-auth-negotiate.c 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-negotiate.c 2016-03-14 16:19:35.000000000 +0000 @@ -0,0 +1,611 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * soup-auth-negotiate.c: HTTP Negotiate Authentication helper + * + * Copyright (C) 2009,2013 Guido Guenther + * Copyright (C) 2016 Red Hat, Inc. + */ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include + +#ifdef LIBSOUP_HAVE_GSSAPI +#include +#include +#endif /* LIBSOUP_HAVE_GSSAPI */ + +#include "soup-auth-negotiate.h" +#include "soup-headers.h" +#include "soup-message.h" +#include "soup-message-private.h" +#include "soup-misc-private.h" +#include "soup-uri.h" + +/** + * SOUP_TYPE_AUTH_NEGOTIATE: + * + * A #GType corresponding to HTTP-based GSS-Negotiate authentication. + * #SoupSessions do not support this type by default; if you want to + * enable support for it, call soup_session_add_feature_by_type(), + * passing %SOUP_TYPE_AUTH_NEGOTIATE. + * + * This auth type will only work if libsoup was compiled with GSSAPI + * support; you can check soup_auth_negotiate_supported() to see if it + * was. + * + * Since: 2.54 + */ +G_DEFINE_TYPE (SoupAuthNegotiate, soup_auth_negotiate, SOUP_TYPE_CONNECTION_AUTH) + +/** + * soup_auth_negotiate_supported: + * + * Indicates whether libsoup was built with GSSAPI support. If this is + * %FALSE, %SOUP_TYPE_AUTH_NEGOTIATE will still be defined and can + * still be added to a #SoupSession, but libsoup will never attempt to + * actually use this auth type. + * + * Since: 2.54 + */ +gboolean +soup_auth_negotiate_supported (void) +{ +#ifdef LIBSOUP_HAVE_GSSAPI + return TRUE; +#else + return FALSE; +#endif +} + +#ifdef LIBSOUP_HAVE_GSSAPI +#define AUTH_GSS_ERROR -1 +#define AUTH_GSS_COMPLETE 1 +#define AUTH_GSS_CONTINUE 0 + +typedef enum { + SOUP_NEGOTIATE_NEW, + SOUP_NEGOTIATE_RECEIVED_CHALLENGE, /* received initial negotiate header */ + SOUP_NEGOTIATE_SENT_RESPONSE, /* sent response to server */ + SOUP_NEGOTIATE_FAILED +} SoupNegotiateState; + +typedef struct { + gboolean initialized; + gchar *response_header; + + gss_ctx_id_t context; + gss_name_t server_name; + + SoupNegotiateState state; +} SoupNegotiateConnectionState; + +typedef struct { + gboolean is_authenticated; + + gulong message_finished_signal_id; + gulong message_got_headers_signal_id; + + SoupNegotiateConnectionState *conn_state; +} SoupAuthNegotiatePrivate; + +#define SOUP_AUTH_NEGOTIATE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SOUP_TYPE_AUTH_NEGOTIATE, SoupAuthNegotiatePrivate)) + +static gboolean check_auth_trusted_uri (SoupConnectionAuth *auth, + SoupMessage *msg); +static gboolean soup_gss_build_response (SoupNegotiateConnectionState *conn, + SoupAuth *auth, GError **err); +static void soup_gss_client_cleanup (SoupNegotiateConnectionState *conn); +static gboolean soup_gss_client_init (SoupNegotiateConnectionState *conn, + const char *host, GError **err); +static int soup_gss_client_step (SoupNegotiateConnectionState *conn, + const char *host, GError **err); + +static GSList *trusted_uris; +static GSList *blacklisted_uris; + +static void parse_uris_from_env_variable (const gchar *env_variable, GSList **list); + +static void check_server_response (SoupMessage *msg, gpointer auth); +static void remove_server_response_handler (SoupMessage *msg, gpointer auth); + +static const char spnego_OID[] = "\x2b\x06\x01\x05\x05\x02"; +static const gss_OID_desc gss_mech_spnego = { sizeof (spnego_OID) - 1, (void *) &spnego_OID }; + +static gpointer +soup_auth_negotiate_create_connection_state (SoupConnectionAuth *auth) +{ + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (auth); + SoupNegotiateConnectionState *conn; + + conn = g_slice_new0 (SoupNegotiateConnectionState); + conn->state = SOUP_NEGOTIATE_NEW; + priv->conn_state = conn; + + return conn; +} + +static void +free_connection_state_data (SoupNegotiateConnectionState *conn) +{ + soup_gss_client_cleanup (conn); + g_free (conn->response_header); +} + +static void +soup_auth_negotiate_free_connection_state (SoupConnectionAuth *auth, + gpointer state) +{ + SoupAuthNegotiate *negotiate = SOUP_AUTH_NEGOTIATE (auth); + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (negotiate); + SoupNegotiateConnectionState *conn = state; + + free_connection_state_data (conn); + + g_slice_free (SoupNegotiateConnectionState, conn); + priv->conn_state = NULL; +} + +static GSList * +soup_auth_negotiate_get_protection_space (SoupAuth *auth, SoupURI *source_uri) +{ + char *space, *p; + + space = g_strdup (source_uri->path); + + /* Strip filename component */ + p = strrchr (space, '/'); + if (p && p == space && p[1]) + p[1] = '\0'; + else if (p && p[1]) + *p = '\0'; + + return g_slist_prepend (NULL, space); +} + +static void +soup_auth_negotiate_authenticate (SoupAuth *auth, const char *username, + const char *password) +{ + SoupAuthNegotiate *negotiate = SOUP_AUTH_NEGOTIATE (auth); + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (negotiate); + + /* It is not possible to authenticate with username and password. */ + priv->is_authenticated = FALSE; +} + +static gboolean +soup_auth_negotiate_is_authenticated (SoupAuth *auth) +{ + SoupAuthNegotiate *negotiate = SOUP_AUTH_NEGOTIATE (auth); + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (negotiate); + + /* We are authenticated just in case we received the GSS_S_COMPLETE. */ + return priv->is_authenticated; +} + +static gboolean +soup_auth_negotiate_can_authenticate (SoupAuth *auth) +{ + return FALSE; +} + +static char * +soup_auth_negotiate_get_connection_authorization (SoupConnectionAuth *auth, + SoupMessage *msg, + gpointer state) +{ + SoupNegotiateConnectionState *conn = state; + char *header = NULL; + + if (conn->state == SOUP_NEGOTIATE_RECEIVED_CHALLENGE) { + header = conn->response_header; + conn->response_header = NULL; + conn->state = SOUP_NEGOTIATE_SENT_RESPONSE; + } + + return header; +} + +static gboolean +soup_auth_negotiate_is_connection_ready (SoupConnectionAuth *auth, + SoupMessage *msg, + gpointer state) +{ + SoupNegotiateConnectionState *conn = state; + + return conn->state != SOUP_NEGOTIATE_FAILED; +} +#endif /* LIBSOUP_HAVE_GSSAPI */ + +static gboolean +soup_auth_negotiate_update_connection (SoupConnectionAuth *auth, SoupMessage *msg, + const char *header, gpointer state) +{ +#ifdef LIBSOUP_HAVE_GSSAPI + gboolean success = TRUE; + SoupNegotiateConnectionState *conn = state; + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (auth); + GError *err = NULL; + + if (!check_auth_trusted_uri (auth, msg)) { + conn->state = SOUP_NEGOTIATE_FAILED; + goto out; + } + + /* Found negotiate header with no token, start negotiate */ + if (strcmp (header, "Negotiate") == 0) { + /* If we were already negotiating and we get a 401 + * with no token, start again. */ + if (conn->state == SOUP_NEGOTIATE_SENT_RESPONSE) { + free_connection_state_data (conn); + conn->initialized = FALSE; + } + + conn->state = SOUP_NEGOTIATE_RECEIVED_CHALLENGE; + if (soup_gss_build_response (conn, SOUP_AUTH (auth), &err)) { + /* Register the callbacks just once */ + if (priv->message_finished_signal_id == 0) { + gulong id = 0; + id = g_signal_connect (msg, + "finished", + G_CALLBACK (remove_server_response_handler), + auth); + priv->message_finished_signal_id = id; + } + + if (priv->message_got_headers_signal_id == 0) { + gulong id = 0; + /* Wait for the 2xx response to verify server response */ + id = g_signal_connect (msg, + "got_headers", + G_CALLBACK (check_server_response), + auth); + priv->message_got_headers_signal_id = id; + } + goto out; + } else { + /* FIXME: report further upward via + * soup_message_get_error_message */ + g_warning ("gssapi step failed: %s", err->message); + success = FALSE; + } + } else if (!strncmp (header, "Negotiate ", 10)) { + if (soup_gss_client_step (conn, header + 10, &err) == AUTH_GSS_CONTINUE) { + conn->state = SOUP_NEGOTIATE_RECEIVED_CHALLENGE; + goto out; + } + } + + conn->state = SOUP_NEGOTIATE_FAILED; + out: + g_clear_error (&err); + return success; +#else + return FALSE; +#endif /* LIBSOUP_HAVE_GSSAPI */ +} + +static void +soup_auth_negotiate_init (SoupAuthNegotiate *negotiate) +{ + g_object_set (G_OBJECT (negotiate), SOUP_AUTH_REALM, "", NULL); +} + +static void +soup_auth_negotiate_class_init (SoupAuthNegotiateClass *auth_negotiate_class) +{ + SoupAuthClass *auth_class = SOUP_AUTH_CLASS (auth_negotiate_class); + SoupConnectionAuthClass *conn_auth_class = + SOUP_CONNECTION_AUTH_CLASS (auth_negotiate_class); + + auth_class->scheme_name = "Negotiate"; + auth_class->strength = 0; + + conn_auth_class->update_connection = soup_auth_negotiate_update_connection; +#ifdef LIBSOUP_HAVE_GSSAPI + auth_class->strength = 7; + + conn_auth_class->create_connection_state = soup_auth_negotiate_create_connection_state; + conn_auth_class->free_connection_state = soup_auth_negotiate_free_connection_state; + conn_auth_class->get_connection_authorization = soup_auth_negotiate_get_connection_authorization; + conn_auth_class->is_connection_ready = soup_auth_negotiate_is_connection_ready; + + auth_class->get_protection_space = soup_auth_negotiate_get_protection_space; + auth_class->authenticate = soup_auth_negotiate_authenticate; + auth_class->is_authenticated = soup_auth_negotiate_is_authenticated; + auth_class->can_authenticate = soup_auth_negotiate_can_authenticate; + + g_type_class_add_private (auth_negotiate_class, sizeof (SoupAuthNegotiatePrivate)); + + parse_uris_from_env_variable ("SOUP_GSSAPI_TRUSTED_URIS", &trusted_uris); + parse_uris_from_env_variable ("SOUP_GSSAPI_BLACKLISTED_URIS", &blacklisted_uris); +#endif /* LIBSOUP_HAVE_GSSAPI */ +} + +#ifdef LIBSOUP_HAVE_GSSAPI +static void +check_server_response (SoupMessage *msg, gpointer auth) +{ + gint ret; + const char *auth_headers; + GError *err = NULL; + SoupAuthNegotiate *negotiate = auth; + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (negotiate); + SoupNegotiateConnectionState *conn = priv->conn_state; + + if (auth != soup_message_get_auth (msg)) + return; + + if (msg->status_code == SOUP_STATUS_UNAUTHORIZED) + return; + + /* FIXME: need to check for proxy-auth too */ + auth_headers = soup_message_headers_get_one (msg->response_headers, + "WWW-Authenticate"); + if (!auth_headers || g_ascii_strncasecmp (auth_headers, "Negotiate ", 10) != 0) { + g_warning ("Failed to parse auth header"); + conn->state = SOUP_NEGOTIATE_FAILED; + goto out; + } + + ret = soup_gss_client_step (conn, auth_headers + 10, &err); + + priv->is_authenticated = ret == AUTH_GSS_COMPLETE; + + if (ret == AUTH_GSS_CONTINUE) { + conn->state = SOUP_NEGOTIATE_RECEIVED_CHALLENGE; + } else if (ret == AUTH_GSS_ERROR) { + if (err) + g_warning ("%s", err->message); + conn->state = SOUP_NEGOTIATE_FAILED; + } + out: + g_clear_error (&err); +} + +static void +remove_server_response_handler (SoupMessage *msg, gpointer auth) +{ + SoupAuthNegotiate *negotiate = auth; + SoupAuthNegotiatePrivate *priv = SOUP_AUTH_NEGOTIATE_GET_PRIVATE (negotiate); + + g_signal_handler_disconnect (msg, priv->message_got_headers_signal_id); + priv->message_got_headers_signal_id = 0; + + g_signal_handler_disconnect (msg, priv->message_finished_signal_id); + priv->message_finished_signal_id = 0; +} + +/* Check if scheme://host:port from message matches the given URI. */ +static gint +match_base_uri (SoupURI *list_uri, SoupURI *msg_uri) +{ + if (msg_uri->scheme != list_uri->scheme) + return 1; + + if (list_uri->port && (msg_uri->port != list_uri->port)) + return 1; + + if (list_uri->host) + return !soup_host_matches_host (msg_uri->host, list_uri->host); + + return 0; +} + +/* Parses a comma separated list of URIS from the environment. */ +static void +parse_uris_from_env_variable (const gchar *env_variable, GSList **list) +{ + gchar **uris = NULL; + const gchar *env; + gint i; + guint length; + + /* Initialize the list */ + *list = NULL; + + if (!(env = g_getenv (env_variable))) + return; + + if (!(uris = g_strsplit (env, ",", -1))) + return; + + length = g_strv_length (uris); + for (i = 0; i < length; i++) { + SoupURI *uri; + + /* If the supplied URI is valid, append it to the list */ + if ((uri = soup_uri_new (uris[i]))) + *list = g_slist_prepend (*list, uri); + } + + g_strfreev (uris); +} + +static gboolean +check_auth_trusted_uri (SoupConnectionAuth *auth, SoupMessage *msg) +{ + SoupURI *msg_uri; + GSList *matched = NULL; + + g_return_val_if_fail (auth != NULL, FALSE); + g_return_val_if_fail (msg != NULL, FALSE); + + msg_uri = soup_message_get_uri (msg); + + /* First check if the URI is not on blacklist */ + if (blacklisted_uris && + g_slist_find_custom (blacklisted_uris, msg_uri, (GCompareFunc) match_base_uri)) + return FALSE; + + /* If no trusted URIs are set, we allow all HTTPS URIs */ + if (!trusted_uris) + return msg_uri->scheme == SOUP_URI_SCHEME_HTTPS; + + matched = g_slist_find_custom (trusted_uris, + msg_uri, + (GCompareFunc) match_base_uri); + + return matched ? TRUE : FALSE; +} + +static gboolean +soup_gss_build_response (SoupNegotiateConnectionState *conn, SoupAuth *auth, GError **err) +{ + if (!conn->initialized) + if (!soup_gss_client_init (conn, soup_auth_get_host (auth), err)) + return FALSE; + + if (soup_gss_client_step (conn, "", err) != AUTH_GSS_CONTINUE) + return FALSE; + + return TRUE; +} + +static void +soup_gss_error (OM_uint32 err_maj, OM_uint32 err_min, GError **err) +{ + OM_uint32 maj_stat, min_stat, msg_ctx = 0; + gss_buffer_desc status; + gchar *buf_maj = NULL, *buf_min = NULL; + + do { + maj_stat = gss_display_status (&min_stat, + err_maj, + GSS_C_GSS_CODE, + (gss_OID) &gss_mech_spnego, + &msg_ctx, + &status); + if (GSS_ERROR (maj_stat)) + break; + + buf_maj = g_strdup ((gchar *) status.value); + gss_release_buffer (&min_stat, &status); + + maj_stat = gss_display_status (&min_stat, + err_min, + GSS_C_MECH_CODE, + GSS_C_NULL_OID, + &msg_ctx, + &status); + if (!GSS_ERROR (maj_stat)) { + buf_min = g_strdup ((gchar *) status.value); + gss_release_buffer (&min_stat, &status); + } + + if (err && *err == NULL) { + g_set_error (err, + SOUP_HTTP_ERROR, + SOUP_STATUS_UNAUTHORIZED, + "%s: %s", + buf_maj, + buf_min ? buf_min : ""); + } + g_free (buf_maj); + g_free (buf_min); + buf_min = buf_maj = NULL; + } while (!GSS_ERROR (maj_stat) && msg_ctx != 0); +} + +static gboolean +soup_gss_client_init (SoupNegotiateConnectionState *conn, const gchar *host, GError **err) +{ + OM_uint32 maj_stat, min_stat; + gchar *service = NULL; + gss_buffer_desc token = GSS_C_EMPTY_BUFFER; + gboolean ret = FALSE; + gchar *h; + + conn->server_name = GSS_C_NO_NAME; + conn->context = GSS_C_NO_CONTEXT; + + h = g_ascii_strdown (host, -1); + service = g_strconcat ("HTTP@", h, NULL); + token.length = strlen (service); + token.value = (gchar *) service; + + maj_stat = gss_import_name (&min_stat, + &token, + (gss_OID) GSS_C_NT_HOSTBASED_SERVICE, + &conn->server_name); + + if (GSS_ERROR (maj_stat)) { + soup_gss_error (maj_stat, min_stat, err); + ret = FALSE; + goto out; + } + + conn->initialized = TRUE; + ret = TRUE; +out: + g_free (h); + g_free (service); + return ret; +} + +static gint +soup_gss_client_step (SoupNegotiateConnectionState *conn, const gchar *challenge, GError **err) +{ + OM_uint32 maj_stat, min_stat; + gss_buffer_desc in = GSS_C_EMPTY_BUFFER; + gss_buffer_desc out = GSS_C_EMPTY_BUFFER; + gint ret = AUTH_GSS_CONTINUE; + + g_clear_pointer (&conn->response_header, g_free); + + if (challenge && *challenge) { + size_t len; + in.value = g_base64_decode (challenge, &len); + in.length = len; + } + + maj_stat = gss_init_sec_context (&min_stat, + GSS_C_NO_CREDENTIAL, + &conn->context, + conn->server_name, + (gss_OID) &gss_mech_spnego, + GSS_C_MUTUAL_FLAG, + GSS_C_INDEFINITE, + GSS_C_NO_CHANNEL_BINDINGS, + &in, + NULL, + &out, + NULL, + NULL); + + if ((maj_stat != GSS_S_COMPLETE) && (maj_stat != GSS_S_CONTINUE_NEEDED)) { + soup_gss_error (maj_stat, min_stat, err); + ret = AUTH_GSS_ERROR; + goto out; + } + + ret = (maj_stat == GSS_S_COMPLETE) ? AUTH_GSS_COMPLETE : AUTH_GSS_CONTINUE; + if (out.length) { + gchar *response = g_base64_encode ((const guchar *) out.value, out.length); + conn->response_header = g_strconcat ("Negotiate ", response, NULL); + g_free (response); + maj_stat = gss_release_buffer (&min_stat, &out); + } + +out: + if (out.value) + gss_release_buffer (&min_stat, &out); + if (in.value) + g_free (in.value); + return ret; +} + +static void +soup_gss_client_cleanup (SoupNegotiateConnectionState *conn) +{ + OM_uint32 maj_stat, min_stat; + + gss_release_name (&min_stat, &conn->server_name); + maj_stat = gss_delete_sec_context (&min_stat, &conn->context, GSS_C_NO_BUFFER); + if (maj_stat != GSS_S_COMPLETE) + maj_stat = gss_delete_sec_context (&min_stat, &conn->context, GSS_C_NO_BUFFER); +} +#endif /* LIBSOUP_HAVE_GSSAPI */ diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-negotiate.h libsoup2.4-2.54.1/libsoup/soup-auth-negotiate.h --- libsoup2.4-2.52.2/libsoup/soup-auth-negotiate.h 1970-01-01 00:00:00.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-negotiate.h 2016-03-14 16:19:35.000000000 +0000 @@ -0,0 +1,28 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +/* + * Copyright (C) 2010 Guido Guenther + * Copyright (C) 2016 Red Hat, Inc. + */ + +#ifndef SOUP_AUTH_NEGOTIATE_H +#define SOUP_AUTH_NEGOTIATE_H 1 + +#include "soup-connection-auth.h" + +#define SOUP_AUTH_NEGOTIATE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_AUTH_NEGOTIATE, SoupAuthNegotiate)) +#define SOUP_AUTH_NEGOTIATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_AUTH_NEGOTIATE, SoupAuthNegotiateClass)) +#define SOUP_IS_AUTH_NEGOTIATE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), SOUP_TYPE_AUTH_NEGOTIATE)) +#define SOUP_IS_AUTH_NEGOTIATE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SOUP_TYPE_AUTH_NEGOTIATE)) +#define SOUP_AUTH_NEGOTIATE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_AUTH_NEGOTIATE, SoupAuthNegotiateClass)) + +typedef struct { + SoupConnectionAuth parent; + +} SoupAuthNegotiate; + +typedef struct { + SoupConnectionAuthClass parent_class; + +} SoupAuthNegotiateClass; + +#endif /* SOUP_AUTH_NEGOTIATE_H */ diff -Nru libsoup2.4-2.52.2/libsoup/soup-auth-ntlm.c libsoup2.4-2.54.1/libsoup/soup-auth-ntlm.c --- libsoup2.4-2.52.2/libsoup/soup-auth-ntlm.c 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-auth-ntlm.c 2016-04-25 15:17:18.000000000 +0000 @@ -359,6 +359,7 @@ conn->state = SOUP_NTLM_SSO_FAILED; success = FALSE; } else if (!g_ascii_strcasecmp (response, "PW")) { + conn->state = SOUP_NTLM_SSO_FAILED; priv->sso_available = FALSE; g_free (response); } else { @@ -489,7 +490,7 @@ priv->sso_available = FALSE; } } else { - g_warning ("NTLM single-sign-on using %s failed", NTLM_AUTH); + g_debug ("NTLM single-sign-on using %s failed", NTLM_AUTH); } } /* If NTLM single-sign-on fails, go back to original @@ -525,7 +526,7 @@ #ifdef USE_NTLM_AUTH case SOUP_NTLM_SSO_FAILED: /* Restart request without SSO */ - g_warning ("NTLM single-sign-on by using %s failed", NTLM_AUTH); + g_debug ("NTLM single-sign-on by using %s failed", NTLM_AUTH); priv->sso_available = FALSE; header = soup_ntlm_request (); conn->state = SOUP_NTLM_SENT_REQUEST; diff -Nru libsoup2.4-2.52.2/libsoup/soup-connection-auth.h libsoup2.4-2.54.1/libsoup/soup-connection-auth.h --- libsoup2.4-2.52.2/libsoup/soup-connection-auth.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-connection-auth.h 2016-02-19 14:15:46.000000000 +0000 @@ -44,7 +44,6 @@ gpointer conn); } SoupConnectionAuthClass; -SOUP_AVAILABLE_IN_2_42 GType soup_connection_auth_get_type (void); G_END_DECLS diff -Nru libsoup2.4-2.52.2/libsoup/soup-content-sniffer.c libsoup2.4-2.54.1/libsoup/soup-content-sniffer.c --- libsoup2.4-2.52.2/libsoup/soup-content-sniffer.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-content-sniffer.c 2016-02-19 14:15:46.000000000 +0000 @@ -91,12 +91,12 @@ int table_length) { const guchar *resource = (const guchar *)buffer->data; - int resource_length = MIN (512, buffer->length); + guint resource_length = MIN (512, buffer->length); int i; for (i = 0; i < table_length; i++) { SoupContentSnifferMediaPattern *type_row = &(table[i]); - int j; + guint j; if (resource_length < type_row->pattern_length) continue; @@ -226,9 +226,9 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer) { const char *resource = (const char *)buffer->data; - int resource_length = MIN (512, buffer->length); + guint resource_length = MIN (512, buffer->length); guint32 box_size = *((guint32*)resource); - int i; + guint i; #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ box_size = ((box_size >> 24) | @@ -490,8 +490,8 @@ { char *sniffed_type = NULL; const guchar *resource = (const guchar *)buffer->data; - int resource_length = MIN (512, buffer->length); - int i; + guint resource_length = MIN (512, buffer->length); + guint i; for (i = 0; i < G_N_ELEMENTS (types_table); i++) { SoupContentSnifferPattern *type_row = &(types_table[i]); @@ -500,8 +500,8 @@ continue; if (type_row->has_ws) { - int index_stream = 0; - int index_pattern = 0; + guint index_stream = 0; + guint index_pattern = 0; gboolean skip_row = FALSE; while ((index_stream < resource_length) && @@ -538,7 +538,7 @@ return g_strdup (type_row->sniffed_type); } } else { - int j; + guint j; if (resource_length < type_row->pattern_length) continue; diff -Nru libsoup2.4-2.52.2/libsoup/soup-cookie.c libsoup2.4-2.54.1/libsoup/soup-cookie.c --- libsoup2.4-2.52.2/libsoup/soup-cookie.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-cookie.c 2016-03-14 16:19:35.000000000 +0000 @@ -13,6 +13,7 @@ #include #include "soup-cookie.h" +#include "soup-misc-private.h" #include "soup.h" /** @@ -107,28 +108,10 @@ gboolean soup_cookie_domain_matches (SoupCookie *cookie, const char *host) { - char *match; - int dlen; - const char *domain; - g_return_val_if_fail (cookie != NULL, FALSE); g_return_val_if_fail (host != NULL, FALSE); - domain = cookie->domain; - - if (!g_ascii_strcasecmp (domain, host)) - return TRUE; - if (*domain != '.') - return FALSE; - if (!g_ascii_strcasecmp (domain + 1, host)) - return TRUE; - dlen = strlen (domain); - while ((match = strstr (host, domain))) { - if (!match[dlen]) - return TRUE; - host = match + 1; - } - return FALSE; + return soup_host_matches_host (cookie->domain, host); } static inline const char * diff -Nru libsoup2.4-2.52.2/libsoup/soup-enum-types.c libsoup2.4-2.54.1/libsoup/soup-enum-types.c --- libsoup2.4-2.52.2/libsoup/soup-enum-types.c 2015-11-09 20:25:07.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-enum-types.c 2016-04-26 12:36:15.000000000 +0000 @@ -3,7 +3,12 @@ /* Generated by glib-mkenums. Do not edit */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "soup-enum-types.h" + #define LIBSOUP_USE_UNSTABLE_REQUEST_API #include "soup.h" #include "soup-address.h" diff -Nru libsoup2.4-2.52.2/libsoup/soup-enum-types.h libsoup2.4-2.54.1/libsoup/soup-enum-types.h --- libsoup2.4-2.52.2/libsoup/soup-enum-types.h 2015-11-09 20:25:07.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-enum-types.h 2016-04-26 12:36:15.000000000 +0000 @@ -6,66 +6,71 @@ #ifndef __SOUP_ENUM_TYPES_H__ #define __SOUP_ENUM_TYPES_H__ +#include +#define GLIB_MKENUMS_EXTERN _SOUP_EXTERN #include G_BEGIN_DECLS -GType soup_address_family_get_type (void) G_GNUC_CONST; +#ifndef GLIB_MKENUMS_EXTERN +#define GLIB_MKENUMS_EXTERN +#endif +GLIB_MKENUMS_EXTERN GType soup_address_family_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_ADDRESS_FAMILY (soup_address_family_get_type ()) -GType soup_cacheability_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_cacheability_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_CACHEABILITY (soup_cacheability_get_type ()) -GType soup_cache_response_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_cache_response_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_CACHE_RESPONSE (soup_cache_response_get_type ()) -GType soup_cache_type_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_cache_type_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_CACHE_TYPE (soup_cache_type_get_type ()) -GType soup_cookie_jar_accept_policy_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_cookie_jar_accept_policy_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_COOKIE_JAR_ACCEPT_POLICY (soup_cookie_jar_accept_policy_get_type ()) -GType soup_date_format_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_date_format_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_DATE_FORMAT (soup_date_format_get_type ()) -GType soup_logger_log_level_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_logger_log_level_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_LOGGER_LOG_LEVEL (soup_logger_log_level_get_type ()) -GType soup_http_version_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_http_version_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_HTTP_VERSION (soup_http_version_get_type ()) -GType soup_message_flags_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_message_flags_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_MESSAGE_FLAGS (soup_message_flags_get_type ()) -GType soup_message_priority_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_message_priority_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_MESSAGE_PRIORITY (soup_message_priority_get_type ()) -GType soup_memory_use_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_memory_use_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_MEMORY_USE (soup_memory_use_get_type ()) -GType soup_message_headers_type_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_message_headers_type_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_MESSAGE_HEADERS_TYPE (soup_message_headers_type_get_type ()) -GType soup_encoding_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_encoding_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_ENCODING (soup_encoding_get_type ()) -GType soup_expectation_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_expectation_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_EXPECTATION (soup_expectation_get_type ()) -GType soup_connection_state_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_connection_state_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_CONNECTION_STATE (soup_connection_state_get_type ()) -GType soup_requester_error_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_requester_error_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_REQUESTER_ERROR (soup_requester_error_get_type ()) -GType soup_server_listen_options_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_server_listen_options_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_SERVER_LISTEN_OPTIONS (soup_server_listen_options_get_type ()) -GType soup_request_error_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_request_error_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_REQUEST_ERROR (soup_request_error_get_type ()) -GType soup_socket_io_status_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_socket_io_status_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_SOCKET_IO_STATUS (soup_socket_io_status_get_type ()) -GType soup_status_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_status_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_STATUS (soup_status_get_type ()) -GType soup_known_status_code_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_known_status_code_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_KNOWN_STATUS_CODE (soup_known_status_code_get_type ()) -GType soup_tld_error_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_tld_error_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_TLD_ERROR (soup_tld_error_get_type ()) -GType soup_websocket_error_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_websocket_error_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_WEBSOCKET_ERROR (soup_websocket_error_get_type ()) -GType soup_websocket_connection_type_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_websocket_connection_type_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_WEBSOCKET_CONNECTION_TYPE (soup_websocket_connection_type_get_type ()) -GType soup_websocket_data_type_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_websocket_data_type_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_WEBSOCKET_DATA_TYPE (soup_websocket_data_type_get_type ()) -GType soup_websocket_close_code_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_websocket_close_code_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_WEBSOCKET_CLOSE_CODE (soup_websocket_close_code_get_type ()) -GType soup_websocket_state_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_websocket_state_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_WEBSOCKET_STATE (soup_websocket_state_get_type ()) -GType soup_xmlrpc_error_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_xmlrpc_error_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_XMLRPC_ERROR (soup_xmlrpc_error_get_type ()) -GType soup_xmlrpc_fault_get_type (void) G_GNUC_CONST; +GLIB_MKENUMS_EXTERN GType soup_xmlrpc_fault_get_type (void) G_GNUC_CONST; #define SOUP_TYPE_XMLRPC_FAULT (soup_xmlrpc_fault_get_type ()) G_END_DECLS diff -Nru libsoup2.4-2.52.2/libsoup/soup-form.c libsoup2.4-2.54.1/libsoup/soup-form.c --- libsoup2.4-2.52.2/libsoup/soup-form.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-form.c 2016-02-19 14:15:46.000000000 +0000 @@ -77,7 +77,7 @@ * Decodes @form, which is an urlencoded dataset as defined in the * HTML 4.01 spec. * - * Return value: (element-type utf8 utf8) (transfer full): a hash + * Return value: (element-type utf8 utf8) (transfer container): a hash * table containing the name/value pairs from @encoded_form, which you * can free with g_hash_table_destroy(). **/ @@ -139,7 +139,7 @@ * need to decode it manually, using soup_multipart_new_from_message() * and soup_multipart_get_part(). * - * Return value: (nullable) (element-type utf8 utf8) (transfer full): + * Return value: (nullable) (element-type utf8 utf8) (transfer container): * a hash table containing the name/value pairs (other than * @file_control_name) from @msg, which you can free with * g_hash_table_destroy(). On error, it will return %NULL. diff -Nru libsoup2.4-2.52.2/libsoup/soup-form.h libsoup2.4-2.54.1/libsoup/soup-form.h --- libsoup2.4-2.52.2/libsoup/soup-form.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-form.h 2016-02-19 14:15:46.000000000 +0000 @@ -14,6 +14,7 @@ #define SOUP_FORM_MIME_TYPE_URLENCODED "application/x-www-form-urlencoded" #define SOUP_FORM_MIME_TYPE_MULTIPART "multipart/form-data" +SOUP_AVAILABLE_IN_2_4 GHashTable *soup_form_decode (const char *encoded_form); SOUP_AVAILABLE_IN_2_26 GHashTable *soup_form_decode_multipart (SoupMessage *msg, @@ -22,10 +23,14 @@ char **content_type, SoupBuffer **file); +SOUP_AVAILABLE_IN_2_4 char *soup_form_encode (const char *first_field, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 char *soup_form_encode_hash (GHashTable *form_data_set); +SOUP_AVAILABLE_IN_2_4 char *soup_form_encode_datalist (GData **form_data_set); +SOUP_AVAILABLE_IN_2_4 char *soup_form_encode_valist (const char *first_field, va_list args); @@ -36,13 +41,16 @@ #define soup_form_encode_urlencoded_list soup_form_encode_datalist #endif +SOUP_AVAILABLE_IN_2_4 SoupMessage *soup_form_request_new (const char *method, const char *uri, const char *first_field, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 SoupMessage *soup_form_request_new_from_hash (const char *method, const char *uri, GHashTable *form_data_set); +SOUP_AVAILABLE_IN_2_4 SoupMessage *soup_form_request_new_from_datalist (const char *method, const char *uri, GData **form_data_set); diff -Nru libsoup2.4-2.52.2/libsoup/soup-headers.c libsoup2.4-2.54.1/libsoup/soup-headers.c --- libsoup2.4-2.52.2/libsoup/soup-headers.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-headers.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2001-2003, Ximian, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include @@ -35,17 +39,12 @@ const char *headers_start; char *headers_copy, *name, *name_end, *value, *value_end; char *eol, *sol, *p; + gsize copy_len; gboolean success = FALSE; g_return_val_if_fail (str != NULL, FALSE); g_return_val_if_fail (dest != NULL, FALSE); - /* RFC 2616 does allow NUL bytes in the headers, but httpbis - * is changing that, and we can't deal with them anyway. - */ - if (memchr (str, '\0', len)) - return FALSE; - /* As per RFC 2616 section 19.3, we treat '\n' as the * line terminator, and '\r', if it appears, merely as * ignorable trailing whitespace. @@ -55,14 +54,28 @@ headers_start = memchr (str, '\n', len); if (!headers_start) return FALSE; + /* No '\0's in the Request-Line / Status-Line */ + if (memchr (str, '\0', headers_start - str)) + return FALSE; /* We work on a copy of the headers, which we can write '\0's * into, so that we don't have to individually g_strndup and * then g_free each header name and value. */ - headers_copy = g_strndup (headers_start, len - (headers_start - str)); + copy_len = len - (headers_start - str); + headers_copy = g_malloc (copy_len + 1); + memcpy (headers_copy, headers_start, copy_len); + headers_copy[copy_len] = '\0'; value_end = headers_copy; + /* There shouldn't be any '\0's in the headers already, but + * this is the web we're talking about. + */ + while ((p = memchr (headers_copy, '\0', copy_len))) { + memmove (p, p + 1, copy_len - (p - headers_copy)); + copy_len--; + } + while (*(value_end + 1)) { name = value_end + 1; name_end = strchr (name, ':'); diff -Nru libsoup2.4-2.52.2/libsoup/soup-headers.h libsoup2.4-2.54.1/libsoup/soup-headers.h --- libsoup2.4-2.52.2/libsoup/soup-headers.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-headers.h 2016-02-19 14:15:46.000000000 +0000 @@ -18,6 +18,7 @@ int len, SoupMessageHeaders *dest); +SOUP_AVAILABLE_IN_2_4 guint soup_headers_parse_request (const char *str, int len, SoupMessageHeaders *req_headers, @@ -25,11 +26,13 @@ char **req_path, SoupHTTPVersion *ver); +SOUP_AVAILABLE_IN_2_4 gboolean soup_headers_parse_status_line (const char *status_line, SoupHTTPVersion *ver, guint *status_code, char **reason_phrase); +SOUP_AVAILABLE_IN_2_4 gboolean soup_headers_parse_response (const char *str, int len, SoupMessageHeaders *headers, @@ -38,18 +41,23 @@ char **reason_phrase); /* Individual header parsing */ - +SOUP_AVAILABLE_IN_2_4 GSList *soup_header_parse_list (const char *header); +SOUP_AVAILABLE_IN_2_4 GSList *soup_header_parse_quality_list (const char *header, GSList **unacceptable); +SOUP_AVAILABLE_IN_2_4 void soup_header_free_list (GSList *list); +SOUP_AVAILABLE_IN_2_4 gboolean soup_header_contains (const char *header, const char *token); +SOUP_AVAILABLE_IN_2_4 GHashTable *soup_header_parse_param_list (const char *header); SOUP_AVAILABLE_IN_2_24 GHashTable *soup_header_parse_semi_param_list (const char *header); +SOUP_AVAILABLE_IN_2_4 void soup_header_free_param_list (GHashTable *param_list); SOUP_AVAILABLE_IN_2_26 diff -Nru libsoup2.4-2.52.2/libsoup/soup-logger.h libsoup2.4-2.54.1/libsoup/soup-logger.h --- libsoup2.4-2.52.2/libsoup/soup-logger.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-logger.h 2016-02-19 14:15:46.000000000 +0000 @@ -49,29 +49,36 @@ const char *data, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 GType soup_logger_get_type (void); +SOUP_AVAILABLE_IN_2_4 SoupLogger *soup_logger_new (SoupLoggerLogLevel level, int max_body_size); #ifndef SOUP_DISABLE_DEPRECATED +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_24_FOR(soup_session_add_feature) void soup_logger_attach (SoupLogger *logger, SoupSession *session); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_24_FOR(soup_session_remove_feature) void soup_logger_detach (SoupLogger *logger, SoupSession *session); #endif +SOUP_AVAILABLE_IN_2_4 void soup_logger_set_request_filter (SoupLogger *logger, SoupLoggerFilter request_filter, gpointer filter_data, GDestroyNotify destroy); +SOUP_AVAILABLE_IN_2_4 void soup_logger_set_response_filter (SoupLogger *logger, SoupLoggerFilter response_filter, gpointer filter_data, GDestroyNotify destroy); +SOUP_AVAILABLE_IN_2_4 void soup_logger_set_printer (SoupLogger *logger, SoupLoggerPrinter printer, gpointer printer_data, diff -Nru libsoup2.4-2.52.2/libsoup/soup-message-body.c libsoup2.4-2.54.1/libsoup/soup-message-body.c --- libsoup2.4-2.52.2/libsoup/soup-message-body.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message-body.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2000-2003, Ximian, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "soup-message-body.h" diff -Nru libsoup2.4-2.52.2/libsoup/soup-message-body.h libsoup2.4-2.54.1/libsoup/soup-message-body.h --- libsoup2.4-2.52.2/libsoup/soup-message-body.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message-body.h 2016-02-19 14:15:46.000000000 +0000 @@ -22,23 +22,28 @@ gsize length; } SoupBuffer; +SOUP_AVAILABLE_IN_2_4 GType soup_buffer_get_type (void); #define SOUP_TYPE_BUFFER (soup_buffer_get_type ()) +SOUP_AVAILABLE_IN_2_4 SoupBuffer *soup_buffer_new (SoupMemoryUse use, gconstpointer data, gsize length); SOUP_AVAILABLE_IN_2_32 SoupBuffer *soup_buffer_new_take (guchar *data, gsize length); +SOUP_AVAILABLE_IN_2_4 SoupBuffer *soup_buffer_new_subbuffer (SoupBuffer *parent, gsize offset, gsize length); +SOUP_AVAILABLE_IN_2_4 SoupBuffer *soup_buffer_new_with_owner (gconstpointer data, gsize length, gpointer owner, GDestroyNotify owner_dnotify); +SOUP_AVAILABLE_IN_2_4 gpointer soup_buffer_get_owner (SoupBuffer *buffer); SOUP_AVAILABLE_IN_2_32 void soup_buffer_get_data (SoupBuffer *buffer, @@ -47,7 +52,9 @@ SOUP_AVAILABLE_IN_2_40 GBytes *soup_buffer_get_as_bytes (SoupBuffer *buffer); +SOUP_AVAILABLE_IN_2_4 SoupBuffer *soup_buffer_copy (SoupBuffer *buffer); +SOUP_AVAILABLE_IN_2_4 void soup_buffer_free (SoupBuffer *buffer); typedef struct { @@ -55,9 +62,11 @@ goffset length; } SoupMessageBody; +SOUP_AVAILABLE_IN_2_4 GType soup_message_body_get_type (void); #define SOUP_TYPE_MESSAGE_BODY (soup_message_body_get_type ()) +SOUP_AVAILABLE_IN_2_4 SoupMessageBody *soup_message_body_new (void); SOUP_AVAILABLE_IN_2_24 @@ -66,6 +75,7 @@ SOUP_AVAILABLE_IN_2_24 gboolean soup_message_body_get_accumulate(SoupMessageBody *body); +SOUP_AVAILABLE_IN_2_4 void soup_message_body_append (SoupMessageBody *body, SoupMemoryUse use, gconstpointer data, @@ -74,13 +84,18 @@ void soup_message_body_append_take (SoupMessageBody *body, guchar *data, gsize length); +SOUP_AVAILABLE_IN_2_4 void soup_message_body_append_buffer (SoupMessageBody *body, SoupBuffer *buffer); +SOUP_AVAILABLE_IN_2_4 void soup_message_body_truncate (SoupMessageBody *body); +SOUP_AVAILABLE_IN_2_4 void soup_message_body_complete (SoupMessageBody *body); +SOUP_AVAILABLE_IN_2_4 SoupBuffer *soup_message_body_flatten (SoupMessageBody *body); +SOUP_AVAILABLE_IN_2_4 SoupBuffer *soup_message_body_get_chunk (SoupMessageBody *body, goffset offset); @@ -91,6 +106,7 @@ void soup_message_body_wrote_chunk (SoupMessageBody *body, SoupBuffer *chunk); +SOUP_AVAILABLE_IN_2_4 void soup_message_body_free (SoupMessageBody *body); G_END_DECLS diff -Nru libsoup2.4-2.52.2/libsoup/soup-message.c libsoup2.4-2.54.1/libsoup/soup-message.c --- libsoup2.4-2.52.2/libsoup/soup-message.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2000-2003, Ximian, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "soup-message.h" diff -Nru libsoup2.4-2.52.2/libsoup/soup-message.h libsoup2.4-2.54.1/libsoup/soup-message.h --- libsoup2.4-2.52.2/libsoup/soup-message.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message.h 2016-02-19 14:15:46.000000000 +0000 @@ -58,6 +58,7 @@ void (*_libsoup_reserved3) (void); } SoupMessageClass; +SOUP_AVAILABLE_IN_2_4 GType soup_message_get_type (void); #define SOUP_MESSAGE_METHOD "method" @@ -78,16 +79,20 @@ #define SOUP_MESSAGE_TLS_ERRORS "tls-errors" #define SOUP_MESSAGE_PRIORITY "priority" +SOUP_AVAILABLE_IN_2_4 SoupMessage *soup_message_new (const char *method, const char *uri_string); +SOUP_AVAILABLE_IN_2_4 SoupMessage *soup_message_new_from_uri (const char *method, SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_message_set_request (SoupMessage *msg, const char *content_type, SoupMemoryUse req_use, const char *req_body, gsize req_length); +SOUP_AVAILABLE_IN_2_4 void soup_message_set_response (SoupMessage *msg, const char *content_type, SoupMemoryUse resp_use, @@ -99,13 +104,18 @@ SOUP_HTTP_1_1 = 1 /*< nick=http-1-1 >*/ } SoupHTTPVersion; +SOUP_AVAILABLE_IN_2_4 void soup_message_set_http_version (SoupMessage *msg, SoupHTTPVersion version); +SOUP_AVAILABLE_IN_2_4 SoupHTTPVersion soup_message_get_http_version (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 gboolean soup_message_is_keepalive (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 SoupURI *soup_message_get_uri (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_set_uri (SoupMessage *msg, SoupURI *uri); SOUP_AVAILABLE_IN_2_26 @@ -130,9 +140,11 @@ SOUP_MESSAGE_IGNORE_CONNECTION_LIMITS = (1 << 8) } SoupMessageFlags; +SOUP_AVAILABLE_IN_2_4 void soup_message_set_flags (SoupMessage *msg, SoupMessageFlags flags); +SOUP_AVAILABLE_IN_2_4 SoupMessageFlags soup_message_get_flags (SoupMessage *msg); SOUP_AVAILABLE_IN_2_34 @@ -142,12 +154,14 @@ /* Specialized signal handlers */ +SOUP_AVAILABLE_IN_2_4 guint soup_message_add_header_handler (SoupMessage *msg, const char *signal, const char *header, GCallback callback, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 guint soup_message_add_status_code_handler ( SoupMessage *msg, const char *signal, @@ -158,9 +172,11 @@ /* * Status Setting */ +SOUP_AVAILABLE_IN_2_4 void soup_message_set_status (SoupMessage *msg, guint status_code); +SOUP_AVAILABLE_IN_2_4 void soup_message_set_status_full (SoupMessage *msg, guint status_code, const char *reason_phrase); @@ -176,6 +192,7 @@ gsize max_len, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_42_FOR(SoupRequest) void soup_message_set_chunk_allocator (SoupMessage *msg, SoupChunkAllocator allocator, @@ -207,21 +224,33 @@ SOUP_AVAILABLE_IN_2_44 SoupMessagePriority soup_message_get_priority (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_wrote_informational (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_wrote_headers (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_wrote_chunk (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_wrote_body_data (SoupMessage *msg, SoupBuffer *chunk); +SOUP_AVAILABLE_IN_2_4 void soup_message_wrote_body (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_got_informational (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_got_headers (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_got_chunk (SoupMessage *msg, SoupBuffer *chunk); +SOUP_AVAILABLE_IN_2_4 void soup_message_got_body (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_content_sniffed (SoupMessage *msg, const char *content_type, GHashTable *params); SOUP_AVAILABLE_IN_2_50 void soup_message_starting (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_restarted (SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_message_finished (SoupMessage *msg); G_END_DECLS diff -Nru libsoup2.4-2.52.2/libsoup/soup-message-headers.c libsoup2.4-2.54.1/libsoup/soup-message-headers.c --- libsoup2.4-2.52.2/libsoup/soup-message-headers.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message-headers.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2007, 2008 Red Hat, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "soup-message-headers.h" @@ -135,7 +139,7 @@ soup_message_headers_clear (SoupMessageHeaders *hdrs) { SoupHeader *hdr_array = (SoupHeader *)hdrs->array->data; - int i; + guint i; for (i = 0; i < hdrs->array->len; i++) g_free (hdr_array[i].value); @@ -575,7 +579,7 @@ gpointer user_data) { SoupHeader *hdr_array = (SoupHeader *)hdrs->array->data; - int i; + guint i; for (i = 0; i < hdrs->array->len; i++) func (hdr_array[i].name, hdr_array[i].value, user_data); @@ -945,7 +949,6 @@ GSList *range_list, *r; GArray *array; char *spec, *end; - int i; guint status = SOUP_STATUS_OK; if (!range || strncmp (range, "bytes", 5) != 0) @@ -1004,6 +1007,8 @@ } if (total_length) { + guint i; + g_array_sort (array, sort_ranges); for (i = 1; i < array->len; i++) { SoupRange *cur = &((SoupRange *)array->data)[i]; diff -Nru libsoup2.4-2.52.2/libsoup/soup-message-headers.h libsoup2.4-2.54.1/libsoup/soup-message-headers.h --- libsoup2.4-2.52.2/libsoup/soup-message-headers.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message-headers.h 2016-02-19 14:15:46.000000000 +0000 @@ -11,6 +11,7 @@ G_BEGIN_DECLS typedef struct SoupMessageHeaders SoupMessageHeaders; +SOUP_AVAILABLE_IN_2_4 GType soup_message_headers_get_type (void); #define SOUP_TYPE_MESSAGE_HEADERS (soup_message_headers_get_type ()) @@ -20,25 +21,32 @@ SOUP_MESSAGE_HEADERS_MULTIPART } SoupMessageHeadersType; +SOUP_AVAILABLE_IN_2_4 SoupMessageHeaders *soup_message_headers_new (SoupMessageHeadersType type); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_free (SoupMessageHeaders *hdrs); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_append (SoupMessageHeaders *hdrs, const char *name, const char *value); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_replace (SoupMessageHeaders *hdrs, const char *name, const char *value); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_remove (SoupMessageHeaders *hdrs, const char *name); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_clear (SoupMessageHeaders *hdrs); SOUP_AVAILABLE_IN_2_36 void soup_message_headers_clean_connection_headers (SoupMessageHeaders *hdrs); #ifndef SOUP_DISABLE_DEPRECATED +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_28_FOR ("soup_message_headers_get_one or soup_message_headers_get_list") const char *soup_message_headers_get (SoupMessageHeaders *hdrs, const char *name); @@ -62,6 +70,7 @@ const char *value, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_foreach (SoupMessageHeaders *hdrs, SoupMessageHeadersForeachFunc func, gpointer user_data); @@ -74,8 +83,10 @@ gpointer dummy[3]; } SoupMessageHeadersIter; +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_iter_init (SoupMessageHeadersIter *iter, SoupMessageHeaders *hdrs); +SOUP_AVAILABLE_IN_2_4 gboolean soup_message_headers_iter_next (SoupMessageHeadersIter *iter, const char **name, const char **value); @@ -91,11 +102,15 @@ SOUP_ENCODING_BYTERANGES } SoupEncoding; +SOUP_AVAILABLE_IN_2_4 SoupEncoding soup_message_headers_get_encoding (SoupMessageHeaders *hdrs); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_set_encoding (SoupMessageHeaders *hdrs, SoupEncoding encoding); +SOUP_AVAILABLE_IN_2_4 goffset soup_message_headers_get_content_length (SoupMessageHeaders *hdrs); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_set_content_length (SoupMessageHeaders *hdrs, goffset content_length); @@ -104,7 +119,9 @@ SOUP_EXPECTATION_CONTINUE = (1 << 1) } SoupExpectation; +SOUP_AVAILABLE_IN_2_4 SoupExpectation soup_message_headers_get_expectations (SoupMessageHeaders *hdrs); +SOUP_AVAILABLE_IN_2_4 void soup_message_headers_set_expectations (SoupMessageHeaders *hdrs, SoupExpectation expectations); diff -Nru libsoup2.4-2.52.2/libsoup/soup-message-private.h libsoup2.4-2.54.1/libsoup/soup-message-private.h --- libsoup2.4-2.52.2/libsoup/soup-message-private.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-message-private.h 2016-02-19 14:15:46.000000000 +0000 @@ -106,6 +106,10 @@ /* I/O */ void soup_message_io_stop (SoupMessage *msg); void soup_message_io_finished (SoupMessage *msg); +/* This is supposed to be private, but there are programs that rely on it + * being exported. See bug #687758, #687468. + */ +SOUP_AVAILABLE_IN_2_4 void soup_message_io_cleanup (SoupMessage *msg); void soup_message_io_pause (SoupMessage *msg); void soup_message_io_unpause (SoupMessage *msg); diff -Nru libsoup2.4-2.52.2/libsoup/soup-method.h libsoup2.4-2.54.1/libsoup/soup-method.h --- libsoup2.4-2.52.2/libsoup/soup-method.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-method.h 2016-02-19 14:15:46.000000000 +0000 @@ -58,22 +58,22 @@ /* Do not use these variables directly; use the macros above, which * ensure that they get initialized properly. */ -extern gpointer _SOUP_METHOD_OPTIONS; -extern gpointer _SOUP_METHOD_GET; -extern gpointer _SOUP_METHOD_HEAD; -extern gpointer _SOUP_METHOD_POST; -extern gpointer _SOUP_METHOD_PUT; -extern gpointer _SOUP_METHOD_DELETE; -extern gpointer _SOUP_METHOD_TRACE; -extern gpointer _SOUP_METHOD_CONNECT; +SOUP_VAR gpointer _SOUP_METHOD_OPTIONS; +SOUP_VAR gpointer _SOUP_METHOD_GET; +SOUP_VAR gpointer _SOUP_METHOD_HEAD; +SOUP_VAR gpointer _SOUP_METHOD_POST; +SOUP_VAR gpointer _SOUP_METHOD_PUT; +SOUP_VAR gpointer _SOUP_METHOD_DELETE; +SOUP_VAR gpointer _SOUP_METHOD_TRACE; +SOUP_VAR gpointer _SOUP_METHOD_CONNECT; -extern gpointer _SOUP_METHOD_PROPFIND; -extern gpointer _SOUP_METHOD_PROPPATCH; -extern gpointer _SOUP_METHOD_MKCOL; -extern gpointer _SOUP_METHOD_COPY; -extern gpointer _SOUP_METHOD_MOVE; -extern gpointer _SOUP_METHOD_LOCK; -extern gpointer _SOUP_METHOD_UNLOCK; +SOUP_VAR gpointer _SOUP_METHOD_PROPFIND; +SOUP_VAR gpointer _SOUP_METHOD_PROPPATCH; +SOUP_VAR gpointer _SOUP_METHOD_MKCOL; +SOUP_VAR gpointer _SOUP_METHOD_COPY; +SOUP_VAR gpointer _SOUP_METHOD_MOVE; +SOUP_VAR gpointer _SOUP_METHOD_LOCK; +SOUP_VAR gpointer _SOUP_METHOD_UNLOCK; G_END_DECLS diff -Nru libsoup2.4-2.52.2/libsoup/soup-misc.c libsoup2.4-2.54.1/libsoup/soup-misc.c --- libsoup2.4-2.52.2/libsoup/soup-misc.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-misc.c 2016-03-14 16:19:35.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2000-2003, Ximian, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "soup-misc.h" @@ -237,3 +241,38 @@ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; + +/** + * soup_host_matches_host + * @host: a URI + * @compare_with: a URI + * + * Checks if the @host and @compare_with exactly match or prefixed with a dot. + * + * Return value: %TRUE if the hosts match, %FALSE otherwise + * + * Since: 2.54 + **/ +gboolean +soup_host_matches_host (const gchar *host, const gchar *compare_with) +{ + char *match; + int dlen; + + g_return_val_if_fail (host != NULL, FALSE); + g_return_val_if_fail (compare_with != NULL, FALSE); + + if (!g_ascii_strcasecmp (host, compare_with)) + return TRUE; + if (*host != '.') + return FALSE; + if (!g_ascii_strcasecmp (host + 1, compare_with)) + return TRUE; + dlen = strlen (host); + while ((match = strstr (compare_with, host))) { + if (!match[dlen]) + return TRUE; + compare_with = match + 1; + } + return FALSE; +} diff -Nru libsoup2.4-2.52.2/libsoup/soup-misc.h libsoup2.4-2.54.1/libsoup/soup-misc.h --- libsoup2.4-2.52.2/libsoup/soup-misc.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-misc.h 2016-03-13 15:20:47.000000000 +0000 @@ -11,11 +11,13 @@ G_BEGIN_DECLS /* Non-default-GMainContext operations */ +SOUP_AVAILABLE_IN_2_4 GSource *soup_add_io_watch (GMainContext *async_context, GIOChannel *chan, GIOCondition condition, GIOFunc function, gpointer data); +SOUP_AVAILABLE_IN_2_4 GSource *soup_add_idle (GMainContext *async_context, GSourceFunc function, gpointer data); @@ -23,6 +25,7 @@ GSource *soup_add_completion (GMainContext *async_context, GSourceFunc function, gpointer data); +SOUP_AVAILABLE_IN_2_4 GSource *soup_add_timeout (GMainContext *async_context, guint interval, GSourceFunc function, @@ -30,7 +33,9 @@ /* Misc utils */ +SOUP_AVAILABLE_IN_2_4 guint soup_str_case_hash (gconstpointer key); +SOUP_AVAILABLE_IN_2_4 gboolean soup_str_case_equal (gconstpointer v1, gconstpointer v2); @@ -38,7 +43,8 @@ /* character classes */ -extern const char soup_char_attributes[]; +SOUP_AVAILABLE_IN_2_4 +const char soup_char_attributes[]; #define SOUP_CHAR_URI_PERCENT_ENCODED 0x01 #define SOUP_CHAR_URI_GEN_DELIMS 0x02 #define SOUP_CHAR_URI_SUB_DELIMS 0x04 @@ -52,8 +58,8 @@ #define soup_char_is_token(ch) (!(soup_char_attributes[(guchar)ch] & (SOUP_CHAR_HTTP_SEPARATOR | SOUP_CHAR_HTTP_CTL))) /* SSL stuff */ - -extern const gboolean soup_ssl_supported; +SOUP_AVAILABLE_IN_2_4 +const gboolean soup_ssl_supported; /* Part of a debugging API */ diff -Nru libsoup2.4-2.52.2/libsoup/soup-misc-private.h libsoup2.4-2.54.1/libsoup/soup-misc-private.h --- libsoup2.4-2.52.2/libsoup/soup-misc-private.h 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-misc-private.h 2016-03-14 16:19:35.000000000 +0000 @@ -42,4 +42,7 @@ SoupAddress *soup_address_new_from_gsockaddr (GSocketAddress *addr); +gboolean soup_host_matches_host (const gchar *host, + const gchar *compare_with); + #endif /* SOUP_MISC_PRIVATE_H */ diff -Nru libsoup2.4-2.52.2/libsoup/soup-multipart.c libsoup2.4-2.54.1/libsoup/soup-multipart.c --- libsoup2.4-2.52.2/libsoup/soup-multipart.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-multipart.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2008 Red Hat, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "soup-multipart.h" @@ -412,7 +416,7 @@ const char *name, *value; GString *str; GHashTable *params; - int i; + guint i; params = g_hash_table_new (g_str_hash, g_str_equal); g_hash_table_insert (params, "boundary", multipart->boundary); @@ -476,7 +480,7 @@ soup_multipart_copy (SoupMultipart *multipart) { SoupMultipart *copy; - int i; + guint i; copy = soup_multipart_new_internal (g_strdup (multipart->mime_type), g_strdup (multipart->boundary)); diff -Nru libsoup2.4-2.52.2/libsoup/soup-multipart.h libsoup2.4-2.54.1/libsoup/soup-multipart.h --- libsoup2.4-2.52.2/libsoup/soup-multipart.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-multipart.h 2016-02-19 14:15:46.000000000 +0000 @@ -14,6 +14,7 @@ typedef struct SoupMultipart SoupMultipart; +SOUP_AVAILABLE_IN_2_26 GType soup_multipart_get_type (void); #define SOUP_TYPE_MULTIPART (soup_multipart_get_type ()) diff -Nru libsoup2.4-2.52.2/libsoup/soup-path-map.c libsoup2.4-2.54.1/libsoup/soup-path-map.c --- libsoup2.4-2.52.2/libsoup/soup-path-map.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-path-map.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright (C) 2007 Novell, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include "soup-path-map.h" @@ -58,7 +62,7 @@ soup_path_map_free (SoupPathMap *map) { SoupPathMapping *mappings = (SoupPathMapping *)map->mappings->data; - int i; + guint i; for (i = 0; i < map->mappings->len; i++) { g_free (mappings[i].path); @@ -79,7 +83,8 @@ mapping_lookup (SoupPathMap *map, const char *path, int *match, int *insert) { SoupPathMapping *mappings = (SoupPathMapping *)map->mappings->data; - int i, path_len; + guint i; + int path_len; gboolean exact = FALSE; *match = -1; diff -Nru libsoup2.4-2.52.2/libsoup/soup-proxy-resolver-default.h libsoup2.4-2.54.1/libsoup/soup-proxy-resolver-default.h --- libsoup2.4-2.52.2/libsoup/soup-proxy-resolver-default.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-proxy-resolver-default.h 2016-02-19 14:15:46.000000000 +0000 @@ -6,7 +6,7 @@ #ifndef SOUP_PROXY_RESOLVER_DEFAULT_H #define SOUP_PROXY_RESOLVER_DEFAULT_H 1 -#include +#include #define SOUP_PROXY_RESOLVER_DEFAULT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), SOUP_TYPE_PROXY_RESOLVER_DEFAULT, SoupProxyResolverDefault)) #define SOUP_PROXY_RESOLVER_DEFAULT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_PROXY_RESOLVER_DEFAULT, SoupProxyResolverDefaultClass)) @@ -24,6 +24,7 @@ } SoupProxyResolverDefaultClass; +SOUP_AVAILABLE_IN_2_4 GType soup_proxy_resolver_default_get_type (void); #define SOUP_TYPE_PROXY_RESOLVER_DEFAULT (soup_proxy_resolver_default_get_type ()) diff -Nru libsoup2.4-2.52.2/libsoup/soup-proxy-resolver.h libsoup2.4-2.54.1/libsoup/soup-proxy-resolver.h --- libsoup2.4-2.52.2/libsoup/soup-proxy-resolver.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-proxy-resolver.h 2016-02-19 14:15:46.000000000 +0000 @@ -39,9 +39,11 @@ } SoupProxyResolverInterface; +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_28 GType soup_proxy_resolver_get_type (void); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_28 void soup_proxy_resolver_get_proxy_async (SoupProxyResolver *proxy_resolver, SoupMessage *msg, @@ -49,6 +51,7 @@ GCancellable *cancellable, SoupProxyResolverCallback callback, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_28 guint soup_proxy_resolver_get_proxy_sync (SoupProxyResolver *proxy_resolver, SoupMessage *msg, diff -Nru libsoup2.4-2.52.2/libsoup/soup-server.c libsoup2.4-2.54.1/libsoup/soup-server.c --- libsoup2.4-2.52.2/libsoup/soup-server.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-server.c 2016-04-25 17:48:43.000000000 +0000 @@ -1730,15 +1730,13 @@ SOUP_SOCKET_IS_SERVER, &is_listening, NULL); if (!is_listening) { - if (!soup_socket_listen (listener)) { + if (!soup_socket_listen_full (listener, error)) { SoupAddress *saddr = soup_socket_get_local_address (listener); - g_set_error (error, - G_IO_ERROR, - G_IO_ERROR_FAILED, - _("Could not listen on address %s, port %d"), - soup_address_get_physical (saddr), - soup_address_get_port (saddr)); + g_prefix_error (error, + _("Could not listen on address %s, port %d: "), + soup_address_get_physical (saddr), + soup_address_get_port (saddr)); return FALSE; } } diff -Nru libsoup2.4-2.52.2/libsoup/soup-server.h libsoup2.4-2.54.1/libsoup/soup-server.h --- libsoup2.4-2.52.2/libsoup/soup-server.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-server.h 2016-02-19 14:15:46.000000000 +0000 @@ -20,6 +20,7 @@ #define SOUP_SERVER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_SERVER, SoupServerClass)) typedef struct SoupClientContext SoupClientContext; +SOUP_AVAILABLE_IN_2_4 GType soup_client_context_get_type (void); #define SOUP_TYPE_CLIENT_CONTEXT (soup_client_context_get_type ()) @@ -54,6 +55,7 @@ void (*_libsoup_reserved4) (void); } SoupServerClass; +SOUP_AVAILABLE_IN_2_4 GType soup_server_get_type (void); #define SOUP_SERVER_TLS_CERTIFICATE "tls-certificate" @@ -62,6 +64,7 @@ #define SOUP_SERVER_HTTP_ALIASES "http-aliases" #define SOUP_SERVER_HTTPS_ALIASES "https-aliases" +SOUP_AVAILABLE_IN_2_4 SoupServer *soup_server_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; @@ -70,6 +73,7 @@ const char *ssl_cert_file, const char *ssl_key_file, GError **error); +SOUP_AVAILABLE_IN_2_4 gboolean soup_server_is_https (SoupServer *server); SOUP_AVAILABLE_IN_2_48 @@ -102,6 +106,7 @@ SOUP_AVAILABLE_IN_2_48 GSList *soup_server_get_listeners (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 void soup_server_disconnect (SoupServer *server); SOUP_AVAILABLE_IN_2_50 @@ -120,6 +125,7 @@ SoupClientContext *client, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 void soup_server_add_handler (SoupServer *server, const char *path, SoupServerCallback callback, @@ -146,18 +152,22 @@ gpointer user_data, GDestroyNotify destroy); +SOUP_AVAILABLE_IN_2_4 void soup_server_remove_handler (SoupServer *server, const char *path); +SOUP_AVAILABLE_IN_2_4 void soup_server_add_auth_domain (SoupServer *server, SoupAuthDomain *auth_domain); +SOUP_AVAILABLE_IN_2_4 void soup_server_remove_auth_domain (SoupServer *server, SoupAuthDomain *auth_domain); /* I/O */ - +SOUP_AVAILABLE_IN_2_4 void soup_server_pause_message (SoupServer *server, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_server_unpause_message (SoupServer *server, SoupMessage *msg); @@ -169,8 +179,11 @@ GSocketAddress *soup_client_context_get_local_address (SoupClientContext *client); SOUP_AVAILABLE_IN_2_48 GSocketAddress *soup_client_context_get_remote_address (SoupClientContext *client); +SOUP_AVAILABLE_IN_2_4 const char *soup_client_context_get_host (SoupClientContext *client); +SOUP_AVAILABLE_IN_2_4 SoupAuthDomain *soup_client_context_get_auth_domain (SoupClientContext *client); +SOUP_AVAILABLE_IN_2_4 const char *soup_client_context_get_auth_user (SoupClientContext *client); SOUP_AVAILABLE_IN_2_50 @@ -184,24 +197,32 @@ #define SOUP_SERVER_SSL_CERT_FILE "ssl-cert-file" #define SOUP_SERVER_SSL_KEY_FILE "ssl-key-file" +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 guint soup_server_get_port (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 SoupSocket *soup_server_get_listener (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 GMainContext *soup_server_get_async_context (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 void soup_server_run (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 void soup_server_run_async (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 void soup_server_quit (SoupServer *server); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 SoupAddress *soup_client_context_get_address (SoupClientContext *client); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_48 SoupSocket *soup_client_context_get_socket (SoupClientContext *client); diff -Nru libsoup2.4-2.52.2/libsoup/soup-session-async.c libsoup2.4-2.54.1/libsoup/soup-session-async.c --- libsoup2.4-2.52.2/libsoup/soup-session-async.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-session-async.c 2016-02-19 14:15:46.000000000 +0000 @@ -30,6 +30,8 @@ * linkend="libsoup-session-porting">porting guide. **/ +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + G_DEFINE_TYPE (SoupSessionAsync, soup_session_async, SOUP_TYPE_SESSION) static void @@ -141,3 +143,5 @@ session_class->send_message = soup_session_async_send_message; session_class->cancel_message = soup_session_async_cancel_message; } + +G_GNUC_END_IGNORE_DEPRECATIONS; diff -Nru libsoup2.4-2.52.2/libsoup/soup-session-async.h libsoup2.4-2.54.1/libsoup/soup-session-async.h --- libsoup2.4-2.52.2/libsoup/soup-session-async.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-session-async.h 2016-02-19 14:15:46.000000000 +0000 @@ -14,7 +14,7 @@ #define SOUP_TYPE_SESSION_ASYNC (soup_session_async_get_type ()) #define SOUP_SESSION_ASYNC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION_ASYNC, SoupSessionAsync)) #define SOUP_SESSION_ASYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION_ASYNC, SoupSessionAsyncClass)) -#define SOUP_IS_SESSION_ASYNC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SOUP_TYPE_SESSION_ASYNC)) +#define SOUP_IS_SESSION_ASYNC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), _soup_session_async_get_type_undeprecated ())) #define SOUP_IS_SESSION_ASYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SOUP_TYPE_SESSION_ASYNC)) #define SOUP_SESSION_ASYNC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_SESSION_ASYNC, SoupSessionAsyncClass)) @@ -33,10 +33,24 @@ void (*_libsoup_reserved4) (void); } SoupSessionAsyncClass; +SOUP_AVAILABLE_IN_2_4 +SOUP_DEPRECATED_IN_2_54 GType soup_session_async_get_type (void); +static inline GType +_soup_session_async_get_type_undeprecated (void) +{ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + return soup_session_async_get_type (); + G_GNUC_END_IGNORE_DEPRECATIONS; +} + #ifndef SOUP_DISABLE_DEPRECATED +SOUP_AVAILABLE_IN_2_4 +SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new) SoupSession *soup_session_async_new (void); +SOUP_AVAILABLE_IN_2_4 +SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new) SoupSession *soup_session_async_new_with_options (const char *optname1, ...) G_GNUC_NULL_TERMINATED; #endif diff -Nru libsoup2.4-2.52.2/libsoup/soup-session.c libsoup2.4-2.54.1/libsoup/soup-session.c --- libsoup2.4-2.52.2/libsoup/soup-session.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-session.c 2016-02-19 14:15:46.000000000 +0000 @@ -445,7 +445,7 @@ GPtrArray *langs = NULL; char *lang, *langs_str; int delta; - int i; + guint i; lang_names = g_get_language_names (); g_return_val_if_fail (lang_names != NULL, NULL); @@ -1818,7 +1818,7 @@ SoupSessionPrivate *priv = SOUP_SESSION_GET_PRIVATE (session); SoupConnection *conn; GSList *conns; - int num_pending = 0; + guint num_pending = 0; if (priv->disposed) return FALSE; diff -Nru libsoup2.4-2.52.2/libsoup/soup-session.h libsoup2.4-2.54.1/libsoup/soup-session.h --- libsoup2.4-2.52.2/libsoup/soup-session.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-session.h 2016-02-19 14:15:46.000000000 +0000 @@ -59,6 +59,7 @@ void (*_libsoup_reserved4) (void); } SoupSessionClass; +SOUP_AVAILABLE_IN_2_42 GType soup_session_get_type (void); #define SOUP_SESSION_LOCAL_ADDRESS "local-address" @@ -92,26 +93,34 @@ SoupSession *soup_session_new_with_options (const char *optname1, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 void soup_session_queue_message (SoupSession *session, SoupMessage *msg, SoupSessionCallback callback, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 void soup_session_requeue_message (SoupSession *session, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 guint soup_session_send_message (SoupSession *session, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_session_pause_message (SoupSession *session, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_session_unpause_message (SoupSession *session, SoupMessage *msg); +SOUP_AVAILABLE_IN_2_4 void soup_session_cancel_message (SoupSession *session, SoupMessage *msg, guint status_code); +SOUP_AVAILABLE_IN_2_4 void soup_session_abort (SoupSession *session); +SOUP_AVAILABLE_IN_2_4 GMainContext *soup_session_get_async_context(SoupSession *session); SOUP_AVAILABLE_IN_2_42 @@ -131,7 +140,7 @@ GError **error); #ifndef SOUP_DISABLE_DEPRECATED -/* SOUP_AVAILABLE_IN_2_30 -- this trips up gtkdoc-scan */ +SOUP_AVAILABLE_IN_2_30 SOUP_DEPRECATED_IN_2_38_FOR (soup_session_prefetch_dns) void soup_session_prepare_for_uri (SoupSession *session, SoupURI *uri); diff -Nru libsoup2.4-2.52.2/libsoup/soup-session-sync.c libsoup2.4-2.54.1/libsoup/soup-session-sync.c --- libsoup2.4-2.52.2/libsoup/soup-session-sync.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-session-sync.c 2016-02-19 14:15:46.000000000 +0000 @@ -29,6 +29,8 @@ * linkend="libsoup-session-porting">porting guide. **/ +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + G_DEFINE_TYPE (SoupSessionSync, soup_session_sync, SOUP_TYPE_SESSION) static void @@ -127,3 +129,5 @@ /* virtual method override */ session_class->queue_message = soup_session_sync_queue_message; } + +G_GNUC_END_IGNORE_DEPRECATIONS; diff -Nru libsoup2.4-2.52.2/libsoup/soup-session-sync.h libsoup2.4-2.54.1/libsoup/soup-session-sync.h --- libsoup2.4-2.52.2/libsoup/soup-session-sync.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-session-sync.h 2016-02-19 14:15:46.000000000 +0000 @@ -14,7 +14,7 @@ #define SOUP_TYPE_SESSION_SYNC (soup_session_sync_get_type ()) #define SOUP_SESSION_SYNC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SOUP_TYPE_SESSION_SYNC, SoupSessionSync)) #define SOUP_SESSION_SYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), SOUP_TYPE_SESSION_SYNC, SoupSessionSyncClass)) -#define SOUP_IS_SESSION_SYNC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SOUP_TYPE_SESSION_SYNC)) +#define SOUP_IS_SESSION_SYNC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), _soup_session_sync_get_type_undeprecated ())) #define SOUP_IS_SESSION_SYNC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), SOUP_TYPE_SESSION_SYNC)) #define SOUP_SESSION_SYNC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SOUP_TYPE_SESSION_SYNC, SoupSessionSyncClass)) @@ -33,10 +33,24 @@ void (*_libsoup_reserved4) (void); } SoupSessionSyncClass; +SOUP_AVAILABLE_IN_2_4 +SOUP_DEPRECATED_IN_2_54 GType soup_session_sync_get_type (void); +static inline GType +_soup_session_sync_get_type_undeprecated (void) +{ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; + return soup_session_sync_get_type (); + G_GNUC_END_IGNORE_DEPRECATIONS; +} + #ifndef SOUP_DISABLE_DEPRECATED +SOUP_AVAILABLE_IN_2_4 +SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new) SoupSession *soup_session_sync_new (void); +SOUP_AVAILABLE_IN_2_4 +SOUP_DEPRECATED_IN_2_54_FOR(soup_session_new_with_options) SoupSession *soup_session_sync_new_with_options (const char *optname1, ...) G_GNUC_NULL_TERMINATED; #endif diff -Nru libsoup2.4-2.52.2/libsoup/soup-socket.c libsoup2.4-2.54.1/libsoup/soup-socket.c --- libsoup2.4-2.52.2/libsoup/soup-socket.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-socket.c 2016-04-25 16:48:23.000000000 +0000 @@ -1246,6 +1246,23 @@ **/ gboolean soup_socket_listen (SoupSocket *sock) +{ + return soup_socket_listen_full (sock, NULL); +} + +/** + * soup_socket_listen_full: + * @sock: a server #SoupSocket (which must not already be connected or listening) + * @error: error pointer + * + * Makes @sock start listening on its local address. When connections + * come in, @sock will emit #SoupSocket::new_connection. + * + * Return value: whether or not @sock is now listening. + **/ +gboolean +soup_socket_listen_full (SoupSocket *sock, + GError **error) { SoupSocketPrivate *priv; @@ -1268,7 +1285,7 @@ priv->gsock = g_socket_new (g_socket_address_get_family (addr), G_SOCKET_TYPE_STREAM, G_SOCKET_PROTOCOL_DEFAULT, - NULL); + error); if (!priv->gsock) goto cant_listen; finish_socket_setup (sock); @@ -1285,14 +1302,14 @@ #endif /* Bind */ - if (!g_socket_bind (priv->gsock, addr, TRUE, NULL)) + if (!g_socket_bind (priv->gsock, addr, TRUE, error)) goto cant_listen; /* Force local_addr to be re-resolved now */ g_object_unref (priv->local_addr); priv->local_addr = NULL; /* Listen */ - if (!g_socket_listen (priv->gsock, NULL)) + if (!g_socket_listen (priv->gsock, error)) goto cant_listen; finish_listener_setup (sock); diff -Nru libsoup2.4-2.52.2/libsoup/soup-socket.h libsoup2.4-2.54.1/libsoup/soup-socket.h --- libsoup2.4-2.52.2/libsoup/soup-socket.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-socket.h 2016-02-19 14:15:46.000000000 +0000 @@ -57,32 +57,45 @@ guint status, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 GType soup_socket_get_type (void); +SOUP_AVAILABLE_IN_2_4 SoupSocket *soup_socket_new (const char *optname1, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 void soup_socket_connect_async (SoupSocket *sock, GCancellable *cancellable, SoupSocketCallback callback, gpointer user_data); +SOUP_AVAILABLE_IN_2_4 guint soup_socket_connect_sync (SoupSocket *sock, GCancellable *cancellable); +SOUP_AVAILABLE_IN_2_4 int soup_socket_get_fd (SoupSocket *sock); +SOUP_AVAILABLE_IN_2_4 gboolean soup_socket_listen (SoupSocket *sock); +SOUP_AVAILABLE_IN_2_4 gboolean soup_socket_start_ssl (SoupSocket *sock, GCancellable *cancellable); +SOUP_AVAILABLE_IN_2_4 gboolean soup_socket_start_proxy_ssl (SoupSocket *sock, const char *ssl_host, GCancellable *cancellable); +SOUP_AVAILABLE_IN_2_4 gboolean soup_socket_is_ssl (SoupSocket *sock); +SOUP_AVAILABLE_IN_2_4 void soup_socket_disconnect (SoupSocket *sock); +SOUP_AVAILABLE_IN_2_4 gboolean soup_socket_is_connected (SoupSocket *sock); +SOUP_AVAILABLE_IN_2_4 SoupAddress *soup_socket_get_local_address (SoupSocket *sock); +SOUP_AVAILABLE_IN_2_4 SoupAddress *soup_socket_get_remote_address (SoupSocket *sock); typedef enum { @@ -92,12 +105,14 @@ SOUP_SOCKET_ERROR } SoupSocketIOStatus; +SOUP_AVAILABLE_IN_2_4 SoupSocketIOStatus soup_socket_read (SoupSocket *sock, gpointer buffer, gsize len, gsize *nread, GCancellable *cancellable, GError **error); +SOUP_AVAILABLE_IN_2_4 SoupSocketIOStatus soup_socket_read_until (SoupSocket *sock, gpointer buffer, gsize len, @@ -108,6 +123,7 @@ GCancellable *cancellable, GError **error); +SOUP_AVAILABLE_IN_2_4 SoupSocketIOStatus soup_socket_write (SoupSocket *sock, gconstpointer buffer, gsize len, diff -Nru libsoup2.4-2.52.2/libsoup/soup-socket-private.h libsoup2.4-2.54.1/libsoup/soup-socket-private.h --- libsoup2.4-2.52.2/libsoup/soup-socket-private.h 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-socket-private.h 2016-04-25 16:48:23.000000000 +0000 @@ -46,6 +46,10 @@ SoupURI *soup_socket_get_http_proxy_uri (SoupSocket *sock); +gboolean soup_socket_listen_full (SoupSocket *sock, + GError **error); + + typedef struct { GMainContext *async_context; diff -Nru libsoup2.4-2.52.2/libsoup/soup-socket-properties.c libsoup2.4-2.54.1/libsoup/soup-socket-properties.c --- libsoup2.4-2.52.2/libsoup/soup-socket-properties.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-socket-properties.c 2016-02-19 14:15:46.000000000 +0000 @@ -3,6 +3,10 @@ * Copyright 2013 Red Hat, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "soup-socket-private.h" #include "soup.h" diff -Nru libsoup2.4-2.52.2/libsoup/soup-status.h libsoup2.4-2.54.1/libsoup/soup-status.h --- libsoup2.4-2.52.2/libsoup/soup-status.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-status.h 2016-03-13 15:20:46.000000000 +0000 @@ -93,11 +93,13 @@ SOUP_STATUS_NOT_EXTENDED = 510 /* RFC 2774 */ } SoupStatus; +SOUP_AVAILABLE_IN_2_4 const char *soup_status_get_phrase (guint status_code); SOUP_AVAILABLE_IN_2_26 guint soup_status_proxify (guint status_code); #define SOUP_HTTP_ERROR soup_http_error_quark() +SOUP_AVAILABLE_IN_2_4 GQuark soup_http_error_quark (void); #ifndef SOUP_DISABLE_DEPRECATED diff -Nru libsoup2.4-2.52.2/libsoup/soup-uri.c libsoup2.4-2.54.1/libsoup/soup-uri.c --- libsoup2.4-2.52.2/libsoup/soup-uri.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-uri.c 2016-02-19 14:15:46.000000000 +0000 @@ -5,6 +5,10 @@ * Copyright 1999-2003 Ximian, Inc. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include @@ -864,7 +868,8 @@ * @unescape_extra: (allow-none): reserved characters to unescape (or %NULL) * * %-decodes any "unreserved" characters (or characters in - * @unescape_extra) in @part. + * @unescape_extra) in @part, and %-encodes any non-ASCII + * characters, spaces, and non-printing characters in @part. * * "Unreserved" characters are those that are not allowed to be used * for punctuation according to the URI spec. For example, letters are diff -Nru libsoup2.4-2.52.2/libsoup/soup-uri.h libsoup2.4-2.54.1/libsoup/soup-uri.h --- libsoup2.4-2.52.2/libsoup/soup-uri.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-uri.h 2016-02-19 14:15:46.000000000 +0000 @@ -28,6 +28,7 @@ char *fragment; }; +SOUP_AVAILABLE_IN_2_4 GType soup_uri_get_type (void); #define SOUP_TYPE_URI (soup_uri_get_type ()) @@ -39,68 +40,89 @@ #define SOUP_URI_SCHEME_RESOURCE _SOUP_ATOMIC_INTERN_STRING (_SOUP_URI_SCHEME_RESOURCE, "resource") #define SOUP_URI_SCHEME_WS _SOUP_ATOMIC_INTERN_STRING (_SOUP_URI_SCHEME_WS, "ws") #define SOUP_URI_SCHEME_WSS _SOUP_ATOMIC_INTERN_STRING (_SOUP_URI_SCHEME_WSS, "wss") -extern gpointer _SOUP_URI_SCHEME_HTTP, _SOUP_URI_SCHEME_HTTPS; -extern gpointer _SOUP_URI_SCHEME_FTP; -extern gpointer _SOUP_URI_SCHEME_FILE, _SOUP_URI_SCHEME_DATA, _SOUP_URI_SCHEME_RESOURCE; -extern gpointer _SOUP_URI_SCHEME_WS, _SOUP_URI_SCHEME_WSS; +SOUP_VAR gpointer _SOUP_URI_SCHEME_HTTP, _SOUP_URI_SCHEME_HTTPS; +SOUP_VAR gpointer _SOUP_URI_SCHEME_FTP; +SOUP_VAR gpointer _SOUP_URI_SCHEME_FILE, _SOUP_URI_SCHEME_DATA, _SOUP_URI_SCHEME_RESOURCE; +SOUP_VAR gpointer _SOUP_URI_SCHEME_WS, _SOUP_URI_SCHEME_WSS; + +SOUP_AVAILABLE_IN_2_4 SoupURI *soup_uri_new_with_base (SoupURI *base, const char *uri_string); +SOUP_AVAILABLE_IN_2_4 SoupURI *soup_uri_new (const char *uri_string); +SOUP_AVAILABLE_IN_2_4 char *soup_uri_to_string (SoupURI *uri, gboolean just_path_and_query); +SOUP_AVAILABLE_IN_2_4 SoupURI *soup_uri_copy (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 gboolean soup_uri_equal (SoupURI *uri1, SoupURI *uri2); +SOUP_AVAILABLE_IN_2_4 void soup_uri_free (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 char *soup_uri_encode (const char *part, const char *escape_extra); +SOUP_AVAILABLE_IN_2_4 char *soup_uri_decode (const char *part); +SOUP_AVAILABLE_IN_2_4 char *soup_uri_normalize (const char *part, const char *unescape_extra); +SOUP_AVAILABLE_IN_2_4 gboolean soup_uri_uses_default_port (SoupURI *uri); SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_scheme (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_scheme (SoupURI *uri, const char *scheme); SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_user (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_user (SoupURI *uri, const char *user); SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_password (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_password (SoupURI *uri, const char *password); SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_host (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_host (SoupURI *uri, const char *host); SOUP_AVAILABLE_IN_2_32 guint soup_uri_get_port (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_port (SoupURI *uri, guint port); SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_path (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_path (SoupURI *uri, const char *path); SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_query (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_query (SoupURI *uri, const char *query); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_query_from_form (SoupURI *uri, GHashTable *form); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_query_from_fields (SoupURI *uri, const char *first_field, ...) G_GNUC_NULL_TERMINATED; SOUP_AVAILABLE_IN_2_32 const char *soup_uri_get_fragment (SoupURI *uri); +SOUP_AVAILABLE_IN_2_4 void soup_uri_set_fragment (SoupURI *uri, const char *fragment); diff -Nru libsoup2.4-2.52.2/libsoup/soup-value-utils.c libsoup2.4-2.54.1/libsoup/soup-value-utils.c --- libsoup2.4-2.52.2/libsoup/soup-value-utils.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-value-utils.c 2016-02-19 14:15:46.000000000 +0000 @@ -324,7 +324,7 @@ { GType type; GValue *value; - int i; + guint i; for (i = 0; i < array->n_values; i++) { type = va_arg (args, GType); diff -Nru libsoup2.4-2.52.2/libsoup/soup-value-utils.h libsoup2.4-2.54.1/libsoup/soup-value-utils.h --- libsoup2.4-2.52.2/libsoup/soup-value-utils.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-value-utils.h 2016-02-19 14:15:46.000000000 +0000 @@ -29,59 +29,74 @@ g_free (getv_error); \ } G_STMT_END +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 GHashTable *soup_value_hash_new (void); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 GHashTable *soup_value_hash_new_with_vals (const char *first_key, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 void soup_value_hash_insert_value (GHashTable *hash, const char *key, GValue *value); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 void soup_value_hash_insert (GHashTable *hash, const char *key, GType type, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 void soup_value_hash_insert_vals (GHashTable *hash, const char *first_key, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 gboolean soup_value_hash_lookup (GHashTable *hash, const char *key, GType type, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 gboolean soup_value_hash_lookup_vals (GHashTable *hash, const char *first_key, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 GValueArray *soup_value_array_from_args (va_list args); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 gboolean soup_value_array_to_args (GValueArray *array, va_list args); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 GValueArray *soup_value_array_new (void); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 GValueArray *soup_value_array_new_with_vals (GType first_type, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 void soup_value_array_insert (GValueArray *array, guint index_, GType type, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 void soup_value_array_append (GValueArray *array, GType type, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 void soup_value_array_append_vals (GValueArray *array, GType first_type, ...) G_GNUC_NULL_TERMINATED; +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 gboolean soup_value_array_get_nth (GValueArray *array, guint index_, @@ -89,6 +104,7 @@ ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52 GType soup_byte_array_get_type (void); #define SOUP_TYPE_BYTE_ARRAY (soup_byte_array_get_type ()) diff -Nru libsoup2.4-2.52.2/libsoup/soup-version.h.in libsoup2.4-2.54.1/libsoup/soup-version.h.in --- libsoup2.4-2.52.2/libsoup/soup-version.h.in 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-version.h.in 2016-02-19 14:15:46.000000000 +0000 @@ -22,50 +22,62 @@ (SOUP_MAJOR_VERSION == (major) && SOUP_MINOR_VERSION == (minor) && \ SOUP_MICRO_VERSION >= (micro))) -guint soup_get_major_version (void); - -guint soup_get_minor_version (void); - -guint soup_get_micro_version (void); +#ifndef _SOUP_EXTERN +#define _SOUP_EXTERN extern +#endif -gboolean soup_check_version (guint major, - guint minor, - guint micro); +/* We prefix variable declarations so they can + * properly get exported in Windows DLLs. + */ +#ifndef SOUP_VAR +# ifdef G_PLATFORM_WIN32 +# ifdef LIBSOUP_COMPILATION +# ifdef DLL_EXPORT +# define SOUP_VAR __declspec(dllexport) +# else /* !DLL_EXPORT */ +# define SOUP_VAR extern +# endif /* !DLL_EXPORT */ +# else /* !SOUP_COMPILATION */ +# define SOUP_VAR extern __declspec(dllimport) +# endif /* !LIBSOUP_COMPILATION */ +# else /* !G_PLATFORM_WIN32 */ +# define SOUP_VAR _SOUP_EXTERN +# endif /* !G_PLATFORM_WIN32 */ +#endif /* SOUP_VAR */ /* Deprecation / Availability macros */ -#define SOUP_ENCODE_VERSION(major,minor) ((major) << 16 | (minor) << 8) - -#define SOUP_VERSION_2_24 (SOUP_ENCODE_VERSION (2, 24)) -#define SOUP_VERSION_2_26 (SOUP_ENCODE_VERSION (2, 26)) -#define SOUP_VERSION_2_28 (SOUP_ENCODE_VERSION (2, 28)) -#define SOUP_VERSION_2_30 (SOUP_ENCODE_VERSION (2, 30)) -#define SOUP_VERSION_2_32 (SOUP_ENCODE_VERSION (2, 32)) -#define SOUP_VERSION_2_34 (SOUP_ENCODE_VERSION (2, 34)) -#define SOUP_VERSION_2_36 (SOUP_ENCODE_VERSION (2, 36)) -#define SOUP_VERSION_2_38 (SOUP_ENCODE_VERSION (2, 38)) -#define SOUP_VERSION_2_40 (SOUP_ENCODE_VERSION (2, 40)) -#define SOUP_VERSION_2_42 (SOUP_ENCODE_VERSION (2, 42)) -#define SOUP_VERSION_2_44 (SOUP_ENCODE_VERSION (2, 44)) -#define SOUP_VERSION_2_46 (SOUP_ENCODE_VERSION (2, 46)) -#define SOUP_VERSION_2_48 (SOUP_ENCODE_VERSION (2, 48)) -#define SOUP_VERSION_2_50 (SOUP_ENCODE_VERSION (2, 50)) -#define SOUP_VERSION_2_52 (SOUP_ENCODE_VERSION (2, 52)) +#define SOUP_VERSION_2_24 (G_ENCODE_VERSION (2, 24)) +#define SOUP_VERSION_2_26 (G_ENCODE_VERSION (2, 26)) +#define SOUP_VERSION_2_28 (G_ENCODE_VERSION (2, 28)) +#define SOUP_VERSION_2_30 (G_ENCODE_VERSION (2, 30)) +#define SOUP_VERSION_2_32 (G_ENCODE_VERSION (2, 32)) +#define SOUP_VERSION_2_34 (G_ENCODE_VERSION (2, 34)) +#define SOUP_VERSION_2_36 (G_ENCODE_VERSION (2, 36)) +#define SOUP_VERSION_2_38 (G_ENCODE_VERSION (2, 38)) +#define SOUP_VERSION_2_40 (G_ENCODE_VERSION (2, 40)) +#define SOUP_VERSION_2_42 (G_ENCODE_VERSION (2, 42)) +#define SOUP_VERSION_2_44 (G_ENCODE_VERSION (2, 44)) +#define SOUP_VERSION_2_46 (G_ENCODE_VERSION (2, 46)) +#define SOUP_VERSION_2_48 (G_ENCODE_VERSION (2, 48)) +#define SOUP_VERSION_2_50 (G_ENCODE_VERSION (2, 50)) +#define SOUP_VERSION_2_52 (G_ENCODE_VERSION (2, 52)) +#define SOUP_VERSION_2_54 (G_ENCODE_VERSION (2, 54)) /* evaluates to the current stable version; for development cycles, * this means the next stable target */ #if (SOUP_MINOR_VERSION % 2) -#define SOUP_VERSION_CUR_STABLE (SOUP_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION + 1)) +#define SOUP_VERSION_CUR_STABLE (G_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION + 1)) #else -#define SOUP_VERSION_CUR_STABLE (SOUP_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION)) +#define SOUP_VERSION_CUR_STABLE (G_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION)) #endif /* evaluates to the previous stable version */ #if (SOUP_MINOR_VERSION % 2) -#define SOUP_VERSION_PREV_STABLE (SOUP_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION - 1)) +#define SOUP_VERSION_PREV_STABLE (G_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION - 1)) #else -#define SOUP_VERSION_PREV_STABLE (SOUP_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION - 2)) +#define SOUP_VERSION_PREV_STABLE (G_ENCODE_VERSION (SOUP_MAJOR_VERSION, SOUP_MINOR_VERSION - 2)) #endif #ifndef SOUP_VERSION_MIN_REQUIRED @@ -91,216 +103,246 @@ #error "SOUP_VERSION_MIN_REQUIRED must be >= SOUP_VERSION_2_24" #endif +#define SOUP_AVAILABLE_IN_2_4 _SOUP_EXTERN + #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_24 -# define SOUP_DEPRECATED_IN_2_24 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_24_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_24 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_24_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_24 # define SOUP_DEPRECATED_IN_2_24_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_24 -# define SOUP_AVAILABLE_IN_2_24 GLIB_UNAVAILABLE(2, 24) +# define SOUP_AVAILABLE_IN_2_24 G_UNAVAILABLE(2, 24) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_24 +# define SOUP_AVAILABLE_IN_2_24 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_26 -# define SOUP_DEPRECATED_IN_2_26 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_26_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_26 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_26_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_26 # define SOUP_DEPRECATED_IN_2_26_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_26 -# define SOUP_AVAILABLE_IN_2_26 GLIB_UNAVAILABLE(2, 26) +# define SOUP_AVAILABLE_IN_2_26 G_UNAVAILABLE(2, 26) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_26 +# define SOUP_AVAILABLE_IN_2_26 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_28 -# define SOUP_DEPRECATED_IN_2_28 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_28_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_28 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_28_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_28 # define SOUP_DEPRECATED_IN_2_28_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_28 -# define SOUP_AVAILABLE_IN_2_28 GLIB_UNAVAILABLE(2, 28) +# define SOUP_AVAILABLE_IN_2_28 G_UNAVAILABLE(2, 28) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_28 +# define SOUP_AVAILABLE_IN_2_28 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_30 -# define SOUP_DEPRECATED_IN_2_30 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_30_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_30 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_30_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_30 # define SOUP_DEPRECATED_IN_2_30_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_30 -# define SOUP_AVAILABLE_IN_2_30 GLIB_UNAVAILABLE(2, 30) +# define SOUP_AVAILABLE_IN_2_30 G_UNAVAILABLE(2, 30) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_30 +# define SOUP_AVAILABLE_IN_2_30 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_32 -# define SOUP_DEPRECATED_IN_2_32 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_32_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_32 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_32_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_32 # define SOUP_DEPRECATED_IN_2_32_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_32 -# define SOUP_AVAILABLE_IN_2_32 GLIB_UNAVAILABLE(2, 32) +# define SOUP_AVAILABLE_IN_2_32 G_UNAVAILABLE(2, 32) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_32 +# define SOUP_AVAILABLE_IN_2_32 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_34 -# define SOUP_DEPRECATED_IN_2_34 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_34_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_34 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_34_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_34 # define SOUP_DEPRECATED_IN_2_34_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_34 -# define SOUP_AVAILABLE_IN_2_34 GLIB_UNAVAILABLE(2, 34) +# define SOUP_AVAILABLE_IN_2_34 G_UNAVAILABLE(2, 34) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_34 +# define SOUP_AVAILABLE_IN_2_34 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_36 -# define SOUP_DEPRECATED_IN_2_36 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_36_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_36 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_36_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_36 # define SOUP_DEPRECATED_IN_2_36_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_36 -# define SOUP_AVAILABLE_IN_2_36 GLIB_UNAVAILABLE(2, 36) +# define SOUP_AVAILABLE_IN_2_36 G_UNAVAILABLE(2, 36) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_36 +# define SOUP_AVAILABLE_IN_2_36 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_38 -# define SOUP_DEPRECATED_IN_2_38 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_38_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_38 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_38_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_38 # define SOUP_DEPRECATED_IN_2_38_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_38 -# define SOUP_AVAILABLE_IN_2_38 GLIB_UNAVAILABLE(2, 38) +# define SOUP_AVAILABLE_IN_2_38 G_UNAVAILABLE(2, 38) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_38 +# define SOUP_AVAILABLE_IN_2_38 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_40 -# define SOUP_DEPRECATED_IN_2_40 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_40_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_40 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_40_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_40 # define SOUP_DEPRECATED_IN_2_40_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_40 -# define SOUP_AVAILABLE_IN_2_40 GLIB_UNAVAILABLE(2, 40) +# define SOUP_AVAILABLE_IN_2_40 G_UNAVAILABLE(2, 40) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_40 +# define SOUP_AVAILABLE_IN_2_40 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_42 -# define SOUP_DEPRECATED_IN_2_42 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_42_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_42 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_42_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_42 # define SOUP_DEPRECATED_IN_2_42_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_42 -# define SOUP_AVAILABLE_IN_2_42 GLIB_UNAVAILABLE(2, 42) +# define SOUP_AVAILABLE_IN_2_42 G_UNAVAILABLE(2, 42) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_42 +# define SOUP_AVAILABLE_IN_2_42 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_44 -# define SOUP_DEPRECATED_IN_2_44 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_44_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_44 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_44_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_44 # define SOUP_DEPRECATED_IN_2_44_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_44 -# define SOUP_AVAILABLE_IN_2_44 GLIB_UNAVAILABLE(2, 44) +# define SOUP_AVAILABLE_IN_2_44 G_UNAVAILABLE(2, 44) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_44 +# define SOUP_AVAILABLE_IN_2_44 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_46 -# define SOUP_DEPRECATED_IN_2_46 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_46_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_46 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_46_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_46 # define SOUP_DEPRECATED_IN_2_46_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_46 -# define SOUP_AVAILABLE_IN_2_46 GLIB_UNAVAILABLE(2, 46) +# define SOUP_AVAILABLE_IN_2_46 G_UNAVAILABLE(2, 46) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_46 +# define SOUP_AVAILABLE_IN_2_46 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_48 -# define SOUP_DEPRECATED_IN_2_48 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_48_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_48 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_48_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_48 # define SOUP_DEPRECATED_IN_2_48_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_48 -# define SOUP_AVAILABLE_IN_2_48 GLIB_UNAVAILABLE(2, 48) +# define SOUP_AVAILABLE_IN_2_48 G_UNAVAILABLE(2, 48) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_48 +# define SOUP_AVAILABLE_IN_2_48 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_50 -# define SOUP_DEPRECATED_IN_2_50 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_50_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_50 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_50_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_50 # define SOUP_DEPRECATED_IN_2_50_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_50 -# define SOUP_AVAILABLE_IN_2_50 GLIB_UNAVAILABLE(2, 50) +# define SOUP_AVAILABLE_IN_2_50 G_UNAVAILABLE(2, 50) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_50 +# define SOUP_AVAILABLE_IN_2_50 _SOUP_EXTERN #endif #if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_52 -# define SOUP_DEPRECATED_IN_2_52 GLIB_DEPRECATED -# define SOUP_DEPRECATED_IN_2_52_FOR(f) GLIB_DEPRECATED_FOR(f) +# define SOUP_DEPRECATED_IN_2_52 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_52_FOR(f) G_DEPRECATED_FOR(f) #else # define SOUP_DEPRECATED_IN_2_52 # define SOUP_DEPRECATED_IN_2_52_FOR(f) #endif #if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_52 -# define SOUP_AVAILABLE_IN_2_52 GLIB_UNAVAILABLE(2, 52) +# define SOUP_AVAILABLE_IN_2_52 G_UNAVAILABLE(2, 52) _SOUP_EXTERN +#else +# define SOUP_AVAILABLE_IN_2_52 _SOUP_EXTERN +#endif + +#if SOUP_VERSION_MIN_REQUIRED >= SOUP_VERSION_2_54 +# define SOUP_DEPRECATED_IN_2_54 G_DEPRECATED +# define SOUP_DEPRECATED_IN_2_54_FOR(f) G_DEPRECATED_FOR(f) +#else +# define SOUP_DEPRECATED_IN_2_54 +# define SOUP_DEPRECATED_IN_2_54_FOR(f) +#endif + +#if SOUP_VERSION_MAX_ALLOWED < SOUP_VERSION_2_54 +# define SOUP_AVAILABLE_IN_2_54 G_UNAVAILABLE(2, 54) _SOUP_EXTERN #else -# define SOUP_AVAILABLE_IN_2_52 +# define SOUP_AVAILABLE_IN_2_54 _SOUP_EXTERN #endif +SOUP_AVAILABLE_IN_2_42 +guint soup_get_major_version (void); + +SOUP_AVAILABLE_IN_2_42 +guint soup_get_minor_version (void); + +SOUP_AVAILABLE_IN_2_42 +guint soup_get_micro_version (void); + +SOUP_AVAILABLE_IN_2_42 +gboolean soup_check_version (guint major, + guint minor, + guint micro); + G_END_DECLS #endif /* SOUP_VERSION_H */ diff -Nru libsoup2.4-2.52.2/libsoup/soup-websocket-connection.h libsoup2.4-2.54.1/libsoup/soup-websocket-connection.h --- libsoup2.4-2.52.2/libsoup/soup-websocket-connection.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-websocket-connection.h 2016-02-19 14:15:46.000000000 +0000 @@ -61,6 +61,7 @@ SOUP_AVAILABLE_IN_2_50 GType soup_websocket_connection_get_type (void) G_GNUC_CONST; +SOUP_AVAILABLE_IN_2_50 SoupWebsocketConnection *soup_websocket_connection_new (GIOStream *stream, SoupURI *uri, SoupWebsocketConnectionType type, diff -Nru libsoup2.4-2.52.2/libsoup/soup-xmlrpc.h libsoup2.4-2.54.1/libsoup/soup-xmlrpc.h --- libsoup2.4-2.52.2/libsoup/soup-xmlrpc.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-xmlrpc.h 2016-02-19 14:15:46.000000000 +0000 @@ -43,6 +43,7 @@ SOUP_AVAILABLE_IN_2_52 char *soup_xmlrpc_build_response (GVariant *value, GError **error); +SOUP_AVAILABLE_IN_2_4 char *soup_xmlrpc_build_fault (int fault_code, const char *fault_format, ...) G_GNUC_PRINTF (2, 3); @@ -66,6 +67,7 @@ /* Errors */ #define SOUP_XMLRPC_ERROR soup_xmlrpc_error_quark() +SOUP_AVAILABLE_IN_2_4 GQuark soup_xmlrpc_error_quark (void); typedef enum { @@ -74,6 +76,7 @@ } SoupXMLRPCError; #define SOUP_XMLRPC_FAULT soup_xmlrpc_fault_quark() +SOUP_AVAILABLE_IN_2_4 GQuark soup_xmlrpc_fault_quark (void); typedef enum { diff -Nru libsoup2.4-2.52.2/libsoup/soup-xmlrpc-old.c libsoup2.4-2.54.1/libsoup/soup-xmlrpc-old.c --- libsoup2.4-2.52.2/libsoup/soup-xmlrpc-old.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-xmlrpc-old.c 2016-02-19 14:15:46.000000000 +0000 @@ -102,7 +102,7 @@ } else if (type == G_TYPE_VALUE_ARRAY) { GValueArray *va = g_value_get_boxed (value); xmlNode *node; - int i; + guint i; node = xmlNewChild (xvalue, NULL, (const xmlChar *)"array", NULL); diff -Nru libsoup2.4-2.52.2/libsoup/soup-xmlrpc-old.h libsoup2.4-2.54.1/libsoup/soup-xmlrpc-old.h --- libsoup2.4-2.52.2/libsoup/soup-xmlrpc-old.h 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/libsoup/soup-xmlrpc-old.h 2016-02-19 14:15:46.000000000 +0000 @@ -11,19 +11,23 @@ G_BEGIN_DECLS /* XML-RPC client */ +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_build_request) char *soup_xmlrpc_build_method_call (const char *method_name, GValue *params, int n_params); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_message_new) SoupMessage *soup_xmlrpc_request_new (const char *uri, const char *method_name, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_parse_response) gboolean soup_xmlrpc_parse_method_response (const char *method_response, int length, GValue *value, GError **error); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_parse_response) gboolean soup_xmlrpc_extract_method_response (const char *method_response, int length, @@ -32,22 +36,27 @@ ...); /* XML-RPC server */ +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_parse_request) gboolean soup_xmlrpc_parse_method_call (const char *method_call, int length, char **method_name, GValueArray **params); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_parse_request) gboolean soup_xmlrpc_extract_method_call (const char *method_call, int length, char **method_name, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_build_response) char *soup_xmlrpc_build_method_response (GValue *value); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_message_set_response) void soup_xmlrpc_set_response (SoupMessage *msg, GType type, ...); +SOUP_AVAILABLE_IN_2_4 SOUP_DEPRECATED_IN_2_52_FOR(soup_xmlrpc_message_set_fault) void soup_xmlrpc_set_fault (SoupMessage *msg, int fault_code, diff -Nru libsoup2.4-2.52.2/m4/intltool.m4 libsoup2.4-2.54.1/m4/intltool.m4 --- libsoup2.4-2.52.2/m4/intltool.m4 2015-11-09 20:24:56.000000000 +0000 +++ libsoup2.4-2.54.1/m4/intltool.m4 2016-04-26 12:36:03.000000000 +0000 @@ -155,31 +155,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) diff -Nru libsoup2.4-2.52.2/m4/libtool.m4 libsoup2.4-2.54.1/m4/libtool.m4 --- libsoup2.4-2.52.2/m4/libtool.m4 2015-11-09 20:25:01.000000000 +0000 +++ libsoup2.4-2.54.1/m4/libtool.m4 2016-04-26 12:36:08.000000000 +0000 @@ -1,8 +1,6 @@ # 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, 2011 Free Software -# Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -10,36 +8,30 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010, 2011 Free Software -# Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. +# Copyright (C) 2014 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. + +# GNU Libtool is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of of the License, or +# (at your option) any later version. # -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program or library that is built +# using GNU Libtool, you may include this file under the same +# distribution terms that you use for the rest of that program. # -# GNU Libtool is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of +# GNU Libtool is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . ]) -# serial 57 LT_INIT +# serial 58 LT_INIT # LT_PREREQ(VERSION) @@ -67,7 +59,7 @@ # LT_INIT([OPTIONS]) # ------------------ AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT +[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl AC_BEFORE([$0], [LT_LANG])dnl AC_BEFORE([$0], [LT_OUTPUT])dnl @@ -91,7 +83,7 @@ _LT_SET_OPTIONS([$0], [$1]) # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS=$ltmain # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' @@ -111,26 +103,43 @@ dnl AC_DEFUN([AM_PROG_LIBTOOL], []) +# _LT_PREPARE_CC_BASENAME +# ----------------------- +m4_defun([_LT_PREPARE_CC_BASENAME], [ +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +func_cc_basename () +{ + for cc_temp in @S|@*""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac + done + func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +} +])# _LT_PREPARE_CC_BASENAME + + # _LT_CC_BASENAME(CC) # ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME, +# but that macro is also expanded into generated libtool script, which +# arranges for $SED and $ECHO to be set by different means. m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` +[m4_require([_LT_PREPARE_CC_BASENAME])dnl +AC_REQUIRE([_LT_DECL_SED])dnl +AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +func_cc_basename $1 +cc_basename=$func_cc_basename_result ]) # _LT_FILEUTILS_DEFAULTS # ---------------------- # It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. +# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'. m4_defun([_LT_FILEUTILS_DEFAULTS], [: ${CP="cp -f"} : ${MV="mv -f"} @@ -177,15 +186,16 @@ m4_require([_LT_CMD_OLD_ARCHIVE])dnl m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl m4_require([_LT_WITH_SYSROOT])dnl +m4_require([_LT_CMD_TRUNCATE])dnl _LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our +# See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then +if test -n "\${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi ]) -if test -n "${ZSH_VERSION+set}" ; then +if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi @@ -198,7 +208,7 @@ # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then + if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -209,14 +219,14 @@ ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except MSVC, +# All known linkers require a '.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a -with_gnu_ld="$lt_cv_prog_gnu_ld" +with_gnu_ld=$lt_cv_prog_gnu_ld -old_CC="$CC" -old_CFLAGS="$CFLAGS" +old_CC=$CC +old_CFLAGS=$CFLAGS # Set sane defaults for various variables test -z "$CC" && CC=cc @@ -269,14 +279,14 @@ # _LT_PROG_LTMAIN # --------------- -# Note that this code is called both from `configure', and `config.status' +# Note that this code is called both from 'configure', and 'config.status' # now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, +# 'config.status' has no value for ac_aux_dir unless we are using Automake, # so we pass a copy along to make sure it has a sensible value anyway. m4_defun([_LT_PROG_LTMAIN], [m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl _LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" +ltmain=$ac_aux_dir/ltmain.sh ])# _LT_PROG_LTMAIN @@ -286,7 +296,7 @@ # So that we can recreate a full libtool script including additional # tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' +# in macros and then make a single call at the end using the 'libtool' # label. @@ -421,8 +431,8 @@ # _LT_CONFIG_STATUS_DECLARE([VARNAME]) # ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME +# Quote a variable value, and forward it to 'config.status' so that its +# 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"`']) @@ -446,7 +456,7 @@ # Output comment and list of tags supported by the script m4_defun([_LT_LIBTOOL_TAGS], [_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl +available_tags='_LT_TAGS'dnl ]) @@ -474,7 +484,7 @@ # _LT_LIBTOOL_CONFIG_VARS # ----------------------- # Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' +# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool' # script. Tagged libtool config variables (even for the LIBTOOL CONFIG # section) are produced by _LT_LIBTOOL_TAG_VARS. m4_defun([_LT_LIBTOOL_CONFIG_VARS], @@ -500,8 +510,8 @@ # Send accumulated output to $CONFIG_STATUS. Thanks to the lists of # variables for single and double quote escaping we saved from calls # to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated +# into 'config.status', and then the shell code to quote escape them in +# for loops in 'config.status'. Finally, any additional code accumulated # from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. m4_defun([_LT_CONFIG_COMMANDS], [AC_PROVIDE_IFELSE([LT_OUTPUT], @@ -547,7 +557,7 @@ ]], lt_decl_quote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -560,7 +570,7 @@ ]], lt_decl_dquote_varnames); do case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" + eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes ;; *) eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" @@ -576,7 +586,7 @@ # 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 +# '#!' 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). @@ -598,7 +608,7 @@ _AS_PREPARE exec AS_MESSAGE_FD>&1 _ASEOF -test $lt_write_fail = 0 && chmod +x $1[]dnl +test 0 = "$lt_write_fail" && chmod +x $1[]dnl m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT @@ -621,7 +631,7 @@ } >&AS_MESSAGE_LOG_FD lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, +'$as_me' creates a local libtool stub from the current configuration, for use in further configure time tests before the real libtool is generated. @@ -643,7 +653,7 @@ This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." -while test $[#] != 0 +while test 0 != $[#] do case $[1] in --version | --v* | -V ) @@ -656,10 +666,10 @@ lt_cl_silent=: ;; -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; +Try '$[0] --help' for more information.]) ;; esac shift done @@ -685,7 +695,7 @@ # 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 && +test yes = "$silent" && 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 @@ -705,27 +715,31 @@ _LT_CONFIG_SAVE_COMMANDS([ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our + # See if we are running on zsh, and set the options that allow our # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then + if test -n "${ZSH_VERSION+set}"; then setopt NO_GLOB_SUBST fi - cfgfile="${ofile}T" + cfgfile=${ofile}T trap "$RM \"$cfgfile\"; exit 1" 1 2 15 $RM "$cfgfile" cat <<_LT_EOF >> "$cfgfile" #! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +# Generated automatically by $as_me ($PACKAGE) $VERSION # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. -# + +# Provide generalized library-building support services. +# Written by Gordon Matzigkeit, 1996 + _LT_COPYING _LT_LIBTOOL_TAGS +# Configured defaults for sys_lib_dlsearch_path munging. +: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} + # ### BEGIN LIBTOOL CONFIG _LT_LIBTOOL_CONFIG_VARS _LT_LIBTOOL_TAG_VARS @@ -733,13 +747,24 @@ _LT_EOF + cat <<'_LT_EOF' >> "$cfgfile" + +# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE + +_LT_PREPARE_MUNGE_PATH_LIST +_LT_PREPARE_CC_BASENAME + +# ### END FUNCTIONS SHARED WITH CONFIGURE + +_LT_EOF + case $host_os in aix3*) cat <<\_LT_EOF >> "$cfgfile" # AIX sometimes has problems with the GCC collect2 program. For some # reason, if we set the COLLECT_NAMES environment variable, the problems # vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then +if test set != "${COLLECT_NAMES+set}"; then COLLECT_NAMES= export COLLECT_NAMES fi @@ -756,8 +781,6 @@ sed '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) - _LT_PROG_REPLACE_SHELLFNS - mv -f "$cfgfile" "$ofile" || (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") chmod +x "$ofile" @@ -775,7 +798,6 @@ [m4_if([$1], [], [ PACKAGE='$PACKAGE' VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile'], []) ])dnl /_LT_CONFIG_SAVE_COMMANDS @@ -974,7 +996,7 @@ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then + if test -z "$LT_MULTI_MODULE"; then # By default we will add the -single_module flag. You can override # by either setting the environment variable LT_MULTI_MODULE # non-empty at configure time, or by adding -multi_module to the @@ -992,7 +1014,7 @@ cat conftest.err >&AS_MESSAGE_LOG_FD # Otherwise, if the output was created with a 0 exit code from # the compiler, it worked. - elif test -f libconftest.dylib && test $_lt_result -eq 0; then + elif test -f libconftest.dylib && test 0 = "$_lt_result"; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1010,7 +1032,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], [lt_cv_ld_exported_symbols_list=yes], [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], @@ -1032,7 +1054,7 @@ _lt_result=$? if test -s conftest.err && $GREP force_load conftest.err; then cat conftest.err >&AS_MESSAGE_LOG_FD - elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then + elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1042,32 +1064,32 @@ ]) case $host_os in rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; darwin*) # darwin 5.x on # if running on 10.5 or later, the deployment target defaults # to the OS version, if on x86, and 10.4, the deployment # target defaults to 10.4. Don't you love it? case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + 10.[[012]][[,.]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then + if test yes = "$lt_cv_apple_cc_single_mod"; then _lt_dar_single_mod='$single_module' fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' + if test yes = "$lt_cv_ld_exported_symbols_list"; then + _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym' else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' + _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" && test no = "$lt_cv_ld_force_load"; then _lt_dsymutil='~$DSYMUTIL $lib || :' else _lt_dsymutil= @@ -1087,29 +1109,29 @@ _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\"`' + if test yes = "$lt_cv_ld_force_load"; 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\"`' m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" + _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; + ifort*|nagfor*) _lt_dar_can_shared=yes ;; *) _lt_dar_can_shared=$GCC ;; esac - if test "$_lt_dar_can_shared" = "yes"; then + if test yes = "$_lt_dar_can_shared"; then output_verbose_link_cmd=func_echo_all - _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}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" + _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" + _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" +[ if test yes != "$lt_cv_apple_cc_single_mod"; then + _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1129,7 +1151,7 @@ # Allow to override them for all tags through lt_cv_aix_libpath. m4_defun([_LT_SYS_MODULE_PATH_AIX], [m4_require([_LT_DECL_SED])dnl -if test "${lt_cv_aix_libpath+set}" = set; then +if test set = "${lt_cv_aix_libpath+set}"; then aix_libpath=$lt_cv_aix_libpath else AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])], @@ -1147,7 +1169,7 @@ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi],[]) if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then - _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib" + _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib fi ]) aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1]) @@ -1167,8 +1189,8 @@ # ----------------------- # 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). +# of the generated configure script that will find a shell with a builtin +# printf (that we can use as an echo command). m4_defun([_LT_PROG_ECHO_BACKSLASH], [ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO @@ -1196,10 +1218,10 @@ # Invoke $ECHO with all args, space-separated. func_echo_all () { - $ECHO "$*" + $ECHO "$*" } -case "$ECHO" in +case $ECHO in printf*) AC_MSG_RESULT([printf]) ;; print*) AC_MSG_RESULT([print -r]) ;; *) AC_MSG_RESULT([cat]) ;; @@ -1225,16 +1247,17 @@ AC_DEFUN([_LT_WITH_SYSROOT], [AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], -[ --with-sysroot[=DIR] Search for dependent libraries within DIR - (or the compiler's sysroot if not specified).], +[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], + [Search for dependent libraries within DIR (or the compiler's sysroot + if not specified).])], [], [with_sysroot=no]) dnl lt_sysroot will always be passed unquoted. We quote it here dnl in case the user passed a directory name. lt_sysroot= -case ${with_sysroot} in #( +case $with_sysroot in #( yes) - if test "$GCC" = yes; then + if test yes = "$GCC"; then lt_sysroot=`$CC --print-sysroot 2>/dev/null` fi ;; #( @@ -1244,14 +1267,14 @@ no|'') ;; #( *) - AC_MSG_RESULT([${with_sysroot}]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) ;; esac AC_MSG_RESULT([${lt_sysroot:-no}]) _LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl -[dependent libraries, and in which our libraries should be installed.])]) +[dependent libraries, and where our libraries should be installed.])]) # _LT_ENABLE_LOCK # --------------- @@ -1259,31 +1282,33 @@ [AC_ARG_ENABLE([libtool-lock], [AS_HELP_STRING([--disable-libtool-lock], [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes +test no = "$enable_libtool_lock" || enable_libtool_lock=yes # Some flags need to be propagated to the compiler or linker for good # libtool support. case $host in ia64-*-hpux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set mode + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) - HPUX_IA64_MODE="32" + HPUX_IA64_MODE=32 ;; *ELF-64*) - HPUX_IA64_MODE="64" + HPUX_IA64_MODE=64 ;; esac fi rm -rf conftest* ;; *-*-irix6*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" @@ -1312,9 +1337,46 @@ rm -rf conftest* ;; +mips64*-*linux*) + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. + echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + emul=elf + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) + emul="${emul}32" + ;; + *64-bit*) + emul="${emul}64" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *MSB*) + emul="${emul}btsmip" + ;; + *LSB*) + emul="${emul}ltsmip" + ;; + esac + case `/usr/bin/file conftest.$ac_objext` in + *N32*) + emul="${emul}n32" + ;; + esac + LD="${LD-ld} -m $emul" + fi + rm -rf conftest* + ;; + x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. Note that the listed cases only cover the + # situations where additional linker options are needed (such as when + # doing 32-bit compilation for a host where ld defaults to 64-bit, or + # vice versa); the common cases where no linker options are needed do + # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1324,7 +1386,14 @@ LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - LD="${LD-ld} -m elf_i386" + case `/usr/bin/file conftest.o` in + *x86-64*) + LD="${LD-ld} -m elf32_x86_64" + ;; + *) + LD="${LD-ld} -m elf_i386" + ;; + esac ;; powerpc64le-*linux*) LD="${LD-ld} -m elf32lppclinux" @@ -1369,19 +1438,20 @@ *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" + SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -belf" AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, [AC_LANG_PUSH(C) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then + if test yes != "$lt_cv_cc_needs_belf"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" + CFLAGS=$SAVE_CFLAGS fi ;; *-*solaris*) - # Find out which ABI we are using. + # Find out what ABI is being produced by ac_compile, and set linker + # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in @@ -1389,7 +1459,7 @@ case $lt_cv_prog_gnu_ld in yes*) case $host in - i?86-*-solaris*) + i?86-*-solaris*|x86_64-*-solaris*) LD="${LD-ld} -m elf_x86_64" ;; sparc*-*-solaris*) @@ -1398,7 +1468,7 @@ esac # GNU ld 2.21 introduced _sol2 emulations. Use them if available. if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then - LD="${LD-ld}_sol2" + LD=${LD-ld}_sol2 fi ;; *) @@ -1414,7 +1484,7 @@ ;; esac -need_locks="$enable_libtool_lock" +need_locks=$enable_libtool_lock ])# _LT_ENABLE_LOCK @@ -1433,11 +1503,11 @@ [echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD' AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -eq 0; then + if test 0 -eq "$ac_status"; then # Ensure the archiver fails upon bogus file names. rm -f conftest.$ac_objext libconftest.a AC_TRY_EVAL([lt_ar_try]) - if test "$ac_status" -ne 0; then + if test 0 -ne "$ac_status"; then lt_cv_ar_at_file=@ fi fi @@ -1445,7 +1515,7 @@ ]) ]) -if test "x$lt_cv_ar_at_file" = xno; then +if test no = "$lt_cv_ar_at_file"; then archiver_list_spec= else archiver_list_spec=$lt_cv_ar_at_file @@ -1476,7 +1546,7 @@ if test -n "$RANLIB"; then case $host_os in - openbsd*) + bitrig* | openbsd*) old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) @@ -1512,7 +1582,7 @@ [$2=no m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) echo "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" + lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins @@ -1539,7 +1609,7 @@ $RM conftest* ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$5], , :, [$5]) else m4_if([$6], , :, [$6]) @@ -1561,7 +1631,7 @@ m4_require([_LT_DECL_SED])dnl AC_CACHE_CHECK([$1], [$2], [$2=no - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS $3" echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then @@ -1580,10 +1650,10 @@ fi fi $RM -r conftest* - LDFLAGS="$save_LDFLAGS" + LDFLAGS=$save_LDFLAGS ]) -if test x"[$]$2" = xyes; then +if test yes = "[$]$2"; then m4_if([$4], , :, [$4]) else m4_if([$5], , :, [$5]) @@ -1604,7 +1674,7 @@ AC_MSG_CHECKING([the maximum length of command line arguments]) AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl i=0 - teststring="ABCD" + teststring=ABCD case $build_os in msdosdjgpp*) @@ -1644,7 +1714,7 @@ lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1694,22 +1764,23 @@ ;; *) lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` - if test -n "$lt_cv_sys_max_cmd_len"; then + if test -n "$lt_cv_sys_max_cmd_len" && \ + test undefined != "$lt_cv_sys_max_cmd_len"; then lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` else # Make teststring a little bigger before we do anything with it. # a 1K string should be a reasonable start. - for i in 1 2 3 4 5 6 7 8 ; do + for i in 1 2 3 4 5 6 7 8; do teststring=$teststring$teststring done SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} # 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"`env echo "$teststring$teststring" 2>/dev/null` \ + while { test X`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && - test $i != 17 # 1/2 MB should be enough + test 17 != "$i" # 1/2 MB should be enough do i=`expr $i + 1` teststring=$teststring$teststring @@ -1725,7 +1796,7 @@ ;; esac ]) -if test -n $lt_cv_sys_max_cmd_len ; then +if test -n "$lt_cv_sys_max_cmd_len"; then AC_MSG_RESULT($lt_cv_sys_max_cmd_len) else AC_MSG_RESULT(none) @@ -1753,7 +1824,7 @@ # ---------------------------------------------------------------- m4_defun([_LT_TRY_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "$cross_compiling" = yes; then : +if test yes = "$cross_compiling"; then : [$4] else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 @@ -1800,9 +1871,9 @@ # endif #endif -/* When -fvisbility=hidden is used, assume the code has been annotated +/* When -fvisibility=hidden is used, assume the code has been annotated correspondingly for the symbols needed. */ -#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) int fnord () __attribute__((visibility("default"))); #endif @@ -1828,7 +1899,7 @@ return status; }] _LT_EOF - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null lt_status=$? case x$lt_status in @@ -1849,7 +1920,7 @@ # ------------------ AC_DEFUN([LT_SYS_DLOPEN_SELF], [m4_require([_LT_HEADER_DLFCN])dnl -if test "x$enable_dlopen" != xyes; then +if test yes != "$enable_dlopen"; then enable_dlopen=unknown enable_dlopen_self=unknown enable_dlopen_self_static=unknown @@ -1859,44 +1930,52 @@ case $host_os in beos*) - lt_cv_dlopen="load_add_on" + lt_cv_dlopen=load_add_on lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ;; mingw* | pw32* | cegcc*) - lt_cv_dlopen="LoadLibrary" + lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; cygwin*) - lt_cv_dlopen="dlopen" + lt_cv_dlopen=dlopen lt_cv_dlopen_libs= ;; darwin*) - # if libdl is installed we need to link against it + # if libdl is installed we need to link against it AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[ + lt_cv_dlopen=dyld lt_cv_dlopen_libs= lt_cv_dlopen_self=yes ]) ;; + tpf*) + # Don't try to run any link tests for TPF. We know it's impossible + # because TPF is a cross-compiler, and we know how we open DSOs. + lt_cv_dlopen=dlopen + lt_cv_dlopen_libs= + lt_cv_dlopen_self=no + ;; + *) AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], + [lt_cv_dlopen=shl_load], [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], + [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld], [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], + [lt_cv_dlopen=dlopen], [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl], [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], + [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld], [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) + [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld]) ]) ]) ]) @@ -1905,21 +1984,21 @@ ;; esac - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else + if test no = "$lt_cv_dlopen"; then enable_dlopen=no + else + enable_dlopen=yes fi case $lt_cv_dlopen in dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" + save_CPPFLAGS=$CPPFLAGS + test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - save_LDFLAGS="$LDFLAGS" + save_LDFLAGS=$LDFLAGS wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - save_LIBS="$LIBS" + save_LIBS=$LIBS LIBS="$lt_cv_dlopen_libs $LIBS" AC_CACHE_CHECK([whether a program can dlopen itself], @@ -1929,7 +2008,7 @@ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ]) - if test "x$lt_cv_dlopen_self" = xyes; then + if test yes = "$lt_cv_dlopen_self"; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" AC_CACHE_CHECK([whether a statically linked program can dlopen itself], lt_cv_dlopen_self_static, [dnl @@ -1939,9 +2018,9 @@ ]) fi - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" + CPPFLAGS=$save_CPPFLAGS + LDFLAGS=$save_LDFLAGS + LIBS=$save_LIBS ;; esac @@ -2033,8 +2112,8 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl _LT_COMPILER_C_O([$1]) -hard_links="nottested" -if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then +hard_links=nottested +if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then # do not overwrite the value of need_locks provided by the user AC_MSG_CHECKING([if we can lock with hard links]) hard_links=yes @@ -2044,8 +2123,8 @@ ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) + if test no = "$hard_links"; then + AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe]) need_locks=warn fi else @@ -2072,8 +2151,8 @@ _LT_DECL([], [objdir], [0], [The name of the directory that contains temporary libtool files])dnl m4_pattern_allow([LT_OBJDIR])dnl -AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", - [Define to the sub-directory in which libtool stores uninstalled libraries.]) +AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/", + [Define to the sub-directory where libtool stores uninstalled libraries.]) ])# _LT_CHECK_OBJDIR @@ -2085,15 +2164,15 @@ _LT_TAGVAR(hardcode_action, $1)= if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || test -n "$_LT_TAGVAR(runpath_var, $1)" || - test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then + test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then # We can hardcode non-existent directories. - if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && + if test no != "$_LT_TAGVAR(hardcode_direct, $1)" && # If the only mechanism to avoid hardcoding is shlibpath_var, we # have to relink, otherwise we might link with an installed library # when we should be linking with a yet-to-be-installed one - ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then + ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" && + test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then # Linking always hardcodes the temporary library directory. _LT_TAGVAR(hardcode_action, $1)=relink else @@ -2107,12 +2186,12 @@ fi AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || - test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then +if test relink = "$_LT_TAGVAR(hardcode_action, $1)" || + test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then # Fast installation is not supported enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then +elif test yes = "$shlibpath_overrides_runpath" || + test no = "$enable_shared"; then # Fast installation is not necessary enable_fast_install=needless fi @@ -2136,7 +2215,7 @@ # FIXME - insert some real tests, host_os isn't really good enough case $host_os in darwin*) - if test -n "$STRIP" ; then + if test -n "$STRIP"; then striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) @@ -2154,6 +2233,47 @@ ])# _LT_CMD_STRIPLIB +# _LT_PREPARE_MUNGE_PATH_LIST +# --------------------------- +# Make sure func_munge_path_list() is defined correctly. +m4_defun([_LT_PREPARE_MUNGE_PATH_LIST], +[[# func_munge_path_list VARIABLE PATH +# ----------------------------------- +# VARIABLE is name of variable containing _space_ separated list of +# directories to be munged by the contents of PATH, which is string +# having a format: +# "DIR[:DIR]:" +# string "DIR[ DIR]" will be prepended to VARIABLE +# ":DIR[:DIR]" +# string "DIR[ DIR]" will be appended to VARIABLE +# "DIRP[:DIRP]::[DIRA:]DIRA" +# string "DIRP[ DIRP]" will be prepended to VARIABLE and string +# "DIRA[ DIRA]" will be appended to VARIABLE +# "DIR[:DIR]" +# VARIABLE will be replaced by "DIR[ DIR]" +func_munge_path_list () +{ + case x@S|@2 in + x) + ;; + *:) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\" + ;; + x:*) + eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + *::*) + eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" + eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\" + ;; + *) + eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\" + ;; + esac +} +]])# _LT_PREPARE_PATH_LIST + + # _LT_SYS_DYNAMIC_LINKER([TAG]) # ----------------------------- # PORTME Fill in your ld.so characteristics @@ -2164,17 +2284,18 @@ m4_require([_LT_DECL_OBJDUMP])dnl m4_require([_LT_DECL_SED])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl +m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl AC_MSG_CHECKING([dynamic linker characteristics]) m4_if([$1], [], [ -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $host_os in - darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; - *) lt_awk_arg="/^libraries:/" ;; + 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" ;; + 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 @@ -2190,28 +2311,35 @@ ;; esac # Ok, now we have the path, separated by spaces, we can step through it - # and add multilib dir if necessary. + # and add multilib dir if necessary... lt_tmp_lt_search_path_spec= - lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + # ...but if some path component already ends with the multilib dir we assume + # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer). + case "$lt_multi_os_dir; $lt_search_path_spec " in + "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*) + lt_multi_os_dir= + ;; + esac for lt_sys_path in $lt_search_path_spec; do - if test -d "$lt_sys_path/$lt_multi_os_dir"; then - lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" - else + if test -d "$lt_sys_path$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir" + elif test -n "$lt_multi_os_dir"; then test -d "$lt_sys_path" && \ 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 ' -BEGIN {RS=" "; FS="/|\n";} { - lt_foo=""; - lt_count=0; +BEGIN {RS = " "; FS = "/|\n";} { + lt_foo = ""; + lt_count = 0; for (lt_i = NF; lt_i > 0; lt_i--) { if ($lt_i != "" && $lt_i != ".") { if ($lt_i == "..") { lt_count++; } else { if (lt_count == 0) { - lt_foo="/" $lt_i lt_foo; + lt_foo = "/" $lt_i lt_foo; } else { lt_count--; } @@ -2225,7 +2353,7 @@ # 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'` ;; + $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` else @@ -2234,7 +2362,7 @@ library_names_spec= libname_spec='lib$name' soname_spec= -shrext_cmds=".so" +shrext_cmds=.so postinstall_cmds= postuninstall_cmds= finish_cmds= @@ -2251,14 +2379,17 @@ # flags to be left without arguments need_version=unknown +AC_ARG_VAR([LT_SYS_LIBRARY_PATH], +[User-defined run-time library search path.]) + case $host_os in aix3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' + library_names_spec='$libname$release$shared_ext$versuffix $libname.a' shlibpath_var=LIBPATH # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' + soname_spec='$libname$release$shared_ext$major' ;; aix[[4-9]]*) @@ -2266,41 +2397,91 @@ need_lib_prefix=no need_version=no hardcode_into_libs=yes - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH else # With GCC up to 2.95.x, collect2 would create an import file # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in + # the line '#! .'. This would cause the generated library to + # depend on '.', always an invalid library. This was fixed in # development snapshots of GCC prior to 3.0. case $host_os in aix4 | aix4.[[01]] | aix4.[[01]].*) if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' echo ' yes ' - echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then + echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then : else can_build_shared=no fi ;; esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct + # Using Import Files as archive members, it is possible to support + # filename-based versioning of shared library archives on AIX. While + # this would work for both with and without runtime linking, it will + # prevent static linking of such archives. So we do filename-based + # shared library versioning with .so extension only, which is used + # when both runtime linking and shared linking is enabled. + # Unfortunately, runtime linking may impact performance, so we do + # not want this to be the default eventually. Also, we use the + # versioned .so libs for executables only if there is the -brtl + # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only. + # To allow for filename-based versioning support, we need to create + # libNAME.so.V as an archive file, containing: + # *) an Import File, referring to the versioned filename of the + # archive as well as the shared archive member, telling the + # bitwidth (32 or 64) of that shared object, and providing the + # list of exported symbols of that shared object, eventually + # decorated with the 'weak' keyword + # *) the shared object with the F_LOADONLY flag set, to really avoid + # it being seen by the linker. + # At run time we better use the real file rather than another symlink, + # but for link time we create the symlink libNAME.so -> libNAME.so.V + + case $with_aix_soname,$aix_use_runtimelinking in + # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct # soname into executable. Probably we can add versioning support to # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then + aix,yes) # traditional libtool + dynamic_linker='AIX unversionable lib.so' # If using run time linking (on AIX 4.2 or later) use lib.so # instead of lib.a to let people know that these are not # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + ;; + aix,no) # traditional AIX only + dynamic_linker='AIX lib.a[(]lib.so.V[)]' # We preserve .a as extension for shared libraries through AIX4.2 # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + ;; + svr4,*) # full svr4 only + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,yes) # both, prefer svr4 + dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]" + library_names_spec='$libname$release$shared_ext$major $libname$shared_ext' + # unpreferred sharedlib libNAME.a needs extra handling + postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"' + postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"' + # We do not specify a path in Import Files, so LIBPATH fires. + shlibpath_overrides_runpath=yes + ;; + *,no) # both, prefer aix + dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]" + library_names_spec='$libname$release.a $libname.a' + soname_spec='$libname$release$shared_ext$major' + # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling + postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)' + postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"' + ;; + esac shlibpath_var=LIBPATH fi ;; @@ -2310,18 +2491,18 @@ powerpc) # Since July 2007 AmigaOS4 officially supports .so libraries. # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' ;; 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=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $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 ;; beos*) - library_names_spec='${libname}${shared_ext}' + library_names_spec='$libname$shared_ext' dynamic_linker="$host_os ld.so" shlibpath_var=LIBRARY_PATH ;; @@ -2329,8 +2510,8 @@ bsdi[[45]]*) version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" @@ -2342,7 +2523,7 @@ cygwin* | mingw* | pw32* | cegcc*) version_type=windows - shrext_cmds=".dll" + shrext_cmds=.dll need_version=no need_lib_prefix=no @@ -2351,8 +2532,8 @@ # gcc library_names_spec='$libname.dll.a' # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname~ @@ -2368,17 +2549,17 @@ case $host_os in 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}' + 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"]) ;; mingw* | cegcc*) # MinGW DLLs use traditional 'lib' prefix - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' + library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' @@ -2387,8 +2568,8 @@ *,cl*) # Native MSVC libname_spec='$name' - soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' - library_names_spec='${libname}.dll.lib' + soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='$libname.dll.lib' case $build_os in mingw*) @@ -2415,7 +2596,7 @@ sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ;; *) - sys_lib_search_path_spec="$LIB" + sys_lib_search_path_spec=$LIB if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then # It is most probably a Windows format PATH. sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` @@ -2428,8 +2609,8 @@ esac # DLL is installed to $(libdir)/../bin by postinstall_cmds - postinstall_cmds='base_file=`basename \${file}`~ - dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~ dldir=$destdir/`dirname \$dlpath`~ test -d \$dldir || mkdir -p \$dldir~ $install_prog $dir/$dlname \$dldir/$dlname' @@ -2442,7 +2623,7 @@ *) # Assume MSVC wrapper - library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' + library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; esac @@ -2455,8 +2636,8 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' - soname_spec='${libname}${release}${major}$shared_ext' + library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' @@ -2469,8 +2650,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + 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 ;; @@ -2488,12 +2669,13 @@ version_type=freebsd-$objformat case $version_type in freebsd-elf*) - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' need_version=no need_lib_prefix=no ;; freebsd-*) - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' need_version=yes ;; esac @@ -2518,26 +2700,15 @@ esac ;; -gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - 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 - ;; - haiku*) version_type=linux # correct to gnu/linux during the next big refactor 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' + 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 + shlibpath_overrides_runpath=no sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; @@ -2555,14 +2726,15 @@ dynamic_linker="$host_os dld.so" shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - if test "X$HPUX_IA64_MODE" = X32; then + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' + if test 32 = "$HPUX_IA64_MODE"; then sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" + sys_lib_dlsearch_path_spec=/usr/lib/hpux32 else sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" + sys_lib_dlsearch_path_spec=/usr/lib/hpux64 fi - sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; hppa*64*) shrext_cmds='.sl' @@ -2570,8 +2742,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; @@ -2580,8 +2752,8 @@ dynamic_linker="$host_os dld.sl" shlibpath_var=SHLIB_PATH shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' ;; esac # HP-UX runs *really* slowly unless shared libraries are mode 555, ... @@ -2594,8 +2766,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2606,7 +2778,7 @@ case $host_os in nonstopux*) version_type=nonstopux ;; *) - if test "$lt_cv_prog_gnu_ld" = yes; then + if test yes = "$lt_cv_prog_gnu_ld"; then version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix @@ -2614,8 +2786,8 @@ esac need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext' case $host_os in irix5* | nonstopux*) libsuff= shlibsuff= @@ -2634,8 +2806,8 @@ esac shlibpath_var=LD_LIBRARY${shlibsuff}_PATH shlibpath_overrides_runpath=no - sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" - sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" + sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff" + sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff" hardcode_into_libs=yes ;; @@ -2644,13 +2816,33 @@ dynamic_linker=no ;; +linux*android*) + version_type=none # Android doesn't support versioned libraries. + need_lib_prefix=no + need_version=no + library_names_spec='$libname$release$shared_ext' + soname_spec='$libname$release$shared_ext' + finish_cmds= + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + + # 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 + + dynamic_linker='Android linker' + # Don't embed -rpath directories since the linker doesn't support them. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + ;; + # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) version_type=linux # correct to gnu/linux during the next big refactor 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' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no @@ -2678,11 +2870,15 @@ # 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 + # Ideally, we could use ldconfig to report *all* directores which are + # searched for libraries, however this is still not possible. Aside from not + # being certain /sbin/ldconfig is available, command + # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, + # even though it is searched at run-time. Try to do the best guess by + # appending ld.so.conf contents (and includes) 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" - fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2699,12 +2895,12 @@ need_lib_prefix=no need_version=no if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' dynamic_linker='NetBSD (a.out) ld.so' else - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' dynamic_linker='NetBSD ld.elf_so' fi shlibpath_var=LD_LIBRARY_PATH @@ -2714,7 +2910,7 @@ newsos6) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes ;; @@ -2723,58 +2919,68 @@ version_type=qnx 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' + 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='ldqnx.so' ;; -openbsd*) +openbsd* | bitrig*) version_type=sunos - sys_lib_dlsearch_path_spec="/usr/lib" + sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no - # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. - case $host_os in - openbsd3.3 | openbsd3.3.*) need_version=yes ;; - *) need_version=no ;; - esac - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - case $host_os in - openbsd2.[[89]] | openbsd2.[[89]].*) - shlibpath_overrides_runpath=no - ;; - *) - shlibpath_overrides_runpath=yes - ;; - esac + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then + need_version=no else - shlibpath_overrides_runpath=yes + need_version=yes fi + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' + finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes ;; os2*) libname_spec='$name' - shrext_cmds=".dll" + version_type=windows + shrext_cmds=.dll + need_version=no need_lib_prefix=no - library_names_spec='$libname${shared_ext} $libname.a' + # OS/2 can only load a DLL with a base name of 8 characters or less. + soname_spec='`test -n "$os2dllname" && libname="$os2dllname"; + v=$($ECHO $release$versuffix | tr -d .-); + n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _); + $ECHO $n$v`$shared_ext' + library_names_spec='${libname}_dll.$libext' dynamic_linker='OS/2 ld.exe' - shlibpath_var=LIBPATH + shlibpath_var=BEGINLIBPATH + sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec + postinstall_cmds='base_file=`basename \$file`~ + dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~ + dldir=$destdir/`dirname \$dlpath`~ + test -d \$dldir || mkdir -p \$dldir~ + $install_prog $dir/$dlname \$dldir/$dlname~ + chmod a+x \$dldir/$dlname~ + if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then + eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; + fi' + postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~ + dlpath=$dir/\$dldll~ + $RM \$dlpath' ;; osf3* | osf4* | osf5*) version_type=osf need_lib_prefix=no need_version=no - soname_spec='${libname}${release}${shared_ext}$major' - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='$libname$release$shared_ext$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" - sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ;; rdos*) @@ -2785,8 +2991,8 @@ version_type=linux # correct to gnu/linux during the next big refactor 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' + 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=yes hardcode_into_libs=yes @@ -2796,11 +3002,11 @@ sunos4*) version_type=sunos - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' + library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix' finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then need_lib_prefix=no fi need_version=yes @@ -2808,8 +3014,8 @@ sysv4 | sysv4.3*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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 case $host_vendor in sni) @@ -2830,24 +3036,24 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' - soname_spec='$libname${shared_ext}.$major' + library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext' + soname_spec='$libname$shared_ext.$major' shlibpath_var=LD_LIBRARY_PATH fi ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) - version_type=freebsd-elf + version_type=sco need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext' + soname_spec='$libname$release$shared_ext$major' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes hardcode_into_libs=yes - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' @@ -2865,7 +3071,7 @@ version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=no hardcode_into_libs=yes @@ -2873,8 +3079,8 @@ uts4*) version_type=linux # correct to gnu/linux during the next big refactor - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' + 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 ;; @@ -2883,20 +3089,30 @@ ;; esac AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no +test no = "$dynamic_linker" && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -if test "$GCC" = yes; then +if test yes = "$GCC"; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then + sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec fi -if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" + +if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then + sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec fi +# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... +configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec + +# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code +func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" + +# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool +configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH + _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and restored at link time]) @@ -2929,39 +3145,41 @@ [Whether we should hardcode library paths into libraries]) _LT_DECL([], [sys_lib_search_path_spec], [2], [Compile-time system search path for libraries]) -_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], - [Run-time system search path for libraries]) +_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2], + [Detected run-time system search path for libraries]) +_LT_DECL([], [configure_time_lt_sys_library_path], [2], + [Explicit LT_SYS_LIBRARY_PATH set during ./configure time]) ])# _LT_SYS_DYNAMIC_LINKER # _LT_PATH_TOOL_PREFIX(TOOL) # -------------------------- -# find a file program which can recognize shared library +# find a file program that can recognize shared library AC_DEFUN([_LT_PATH_TOOL_PREFIX], [m4_require([_LT_DECL_EGREP])dnl AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, [case $MAGIC_CMD in [[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. + lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path. ;; *) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_MAGIC_CMD=$MAGIC_CMD + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR dnl $ac_dummy forces splitting on constant user-supplied paths. dnl POSIX.2 word splitting is done only on the output of word expansions, dnl not every word. This closes a longstanding sh security hole. ac_dummy="m4_if([$2], , $PATH, [$2])" for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" + if test -f "$ac_dir/$1"; then + lt_cv_path_MAGIC_CMD=$ac_dir/"$1" if test -n "$file_magic_test_file"; then case $deplibs_check_method in "file_magic "*) file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" + MAGIC_CMD=$lt_cv_path_MAGIC_CMD if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | $EGREP "$file_magic_regex" > /dev/null; then : @@ -2984,11 +3202,11 @@ break fi done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" + IFS=$lt_save_ifs + MAGIC_CMD=$lt_save_MAGIC_CMD ;; esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" +MAGIC_CMD=$lt_cv_path_MAGIC_CMD if test -n "$MAGIC_CMD"; then AC_MSG_RESULT($MAGIC_CMD) else @@ -3006,7 +3224,7 @@ # _LT_PATH_MAGIC # -------------- -# find a file program which can recognize a shared library +# find a file program that can recognize a shared library m4_defun([_LT_PATH_MAGIC], [_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -3033,16 +3251,16 @@ AC_ARG_WITH([gnu-ld], [AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], + [test no = "$withval" || with_gnu_ld=yes], [with_gnu_ld=no])dnl ac_prog=ld -if test "$GCC" = yes; then +if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw + # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; @@ -3056,7 +3274,7 @@ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` done - test -z "$LD" && LD="$ac_prog" + test -z "$LD" && LD=$ac_prog ;; "") # If it fails, then pretend we aren't using GCC. @@ -3067,37 +3285,37 @@ with_gnu_ld=unknown ;; esac -elif test "$with_gnu_ld" = yes; then +elif test yes = "$with_gnu_ld"; then AC_MSG_CHECKING([for GNU ld]) else AC_MSG_CHECKING([for non-GNU ld]) fi AC_CACHE_VAL(lt_cv_path_LD, [if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" + lt_cv_path_LD=$ac_dir/$ac_prog # Check to see if the program is GNU ld. I'd rather use --version, # but apparently some variants of GNU ld only accept -v. # Break only if it was the GNU/non-GNU ld that we prefer. case `"$lt_cv_path_LD" -v 2>&1 conftest.i +cat conftest.i conftest.i >conftest2.i +: ${lt_DD:=$DD} +AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd], +[if "$ac_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=: +fi]) +rm -f conftest.i conftest2.i conftest.out]) +])# _LT_PATH_DD + + +# _LT_CMD_TRUNCATE +# ---------------- +# find command to truncate a binary pipe +m4_defun([_LT_CMD_TRUNCATE], +[m4_require([_LT_PATH_DD]) +AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin], +[printf 0123456789abcdef0123456789abcdef >conftest.i +cat conftest.i conftest.i >conftest2.i +lt_cv_truncate_bin= +if "$ac_cv_path_lt_DD" bs=32 count=1 conftest.out 2>/dev/null; then + cmp -s conftest.i conftest.out \ + && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1" +fi +rm -f conftest.i conftest2.i conftest.out +test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"]) +_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1], + [Command to truncate a binary pipe]) +])# _LT_CMD_TRUNCATE + + # _LT_CHECK_MAGIC_METHOD # ---------------------- # how to check for library dependencies @@ -3183,13 +3438,13 @@ # Need to set the preceding variable on all platforms that support # interlibrary dependencies. # 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. +# 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. # 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. +# that responds to the $file_magic_cmd with a given extended regex. +# If you have 'file' or equivalent on your system and you're not sure +# whether 'pass_all' will *always* work, you probably want this one. case $host_os in aix[[4-9]]*) @@ -3216,8 +3471,7 @@ # 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 @@ -3253,10 +3507,6 @@ fi ;; -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - haiku*) lt_cv_deplibs_check_method=pass_all ;; @@ -3295,7 +3545,7 @@ ;; # This must be glibc/ELF. -linux* | k*bsd*-gnu | kopensolaris*-gnu) +linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) lt_cv_deplibs_check_method=pass_all ;; @@ -3317,8 +3567,8 @@ lt_cv_deplibs_check_method=pass_all ;; -openbsd*) - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then +openbsd* | bitrig*) + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' @@ -3371,6 +3621,9 @@ tpf*) lt_cv_deplibs_check_method=pass_all ;; +os2*) + lt_cv_deplibs_check_method=pass_all + ;; esac ]) @@ -3411,33 +3664,38 @@ AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, [if test -n "$NM"; then # Let the user override the test. - lt_cv_path_NM="$NM" + lt_cv_path_NM=$NM else - lt_nm_to_check="${ac_tool_prefix}nm" + lt_nm_to_check=${ac_tool_prefix}nm if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs test -z "$ac_dir" && ac_dir=. - tmp_nm="$ac_dir/$lt_tmp_nm" - if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then + tmp_nm=$ac_dir/$lt_tmp_nm + if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: + # Adding the 'sed 1q' prevents false positives on HP-UX, which says: # nm: unknown option "B" ignored # Tru64's nm complains that /dev/null is an invalid object file - case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in - */dev/null* | *'Invalid file or object type'*) + # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty + case $build_os in + mingw*) lt_bad_file=conftest.nm/nofile ;; + *) lt_bad_file=/dev/null ;; + esac + case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" - break + break 2 ;; *) case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" - break + break 2 ;; *) lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but @@ -3448,21 +3706,21 @@ esac fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs done : ${lt_cv_path_NM=no} fi]) -if test "$lt_cv_path_NM" != "no"; then - NM="$lt_cv_path_NM" +if test no != "$lt_cv_path_NM"; then + 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 + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in *COFF*) - DUMPBIN="$DUMPBIN -symbols" + DUMPBIN="$DUMPBIN -symbols -headers" ;; *) DUMPBIN=: @@ -3470,8 +3728,8 @@ esac fi AC_SUBST([DUMPBIN]) - if test "$DUMPBIN" != ":"; then - NM="$DUMPBIN" + if test : != "$DUMPBIN"; then + NM=$DUMPBIN fi fi test -z "$NM" && NM=nm @@ -3517,8 +3775,8 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # two different shell functions defined in ltmain.sh - # decide which to use based on capabilities of $DLLTOOL + # two different shell functions defined in ltmain.sh; + # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in *--identify-strict*) lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib @@ -3530,7 +3788,7 @@ ;; *) # fallback: assume linklib IS sharedlib - lt_cv_sharedlib_from_linklib_cmd="$ECHO" + lt_cv_sharedlib_from_linklib_cmd=$ECHO ;; esac ]) @@ -3557,13 +3815,28 @@ lt_cv_path_mainfest_tool=yes fi rm -f conftest*]) -if test "x$lt_cv_path_mainfest_tool" != xyes; then +if test yes != "$lt_cv_path_mainfest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl ])# _LT_PATH_MANIFEST_TOOL +# _LT_DLL_DEF_P([FILE]) +# --------------------- +# True iff FILE is a Windows DLL '.def' file. +# Keep in sync with func_dll_def_p in the libtool script +AC_DEFUN([_LT_DLL_DEF_P], +[dnl + test DEF = "`$SED -n dnl + -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace + -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments + -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl + -e q dnl Only consider the first "real" line + $1`" dnl +])# _LT_DLL_DEF_P + + # LT_LIB_M # -------- # check for math library @@ -3575,11 +3848,11 @@ # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") + AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw) AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ;; *) - AC_CHECK_LIB(m, cos, LIBM="-lm") + AC_CHECK_LIB(m, cos, LIBM=-lm) ;; esac AC_SUBST([LIBM]) @@ -3598,7 +3871,7 @@ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -if test "$GCC" = yes; then +if test yes = "$GCC"; then case $cc_basename in nvcc*) _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;; @@ -3650,7 +3923,7 @@ symcode='[[ABCDGISTW]]' ;; hpux*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then symcode='[[ABCDEGRST]]' fi ;; @@ -3683,14 +3956,44 @@ symcode='[[ABCDGIRSTW]]' ;; esac +if test "$lt_cv_nm_interface" = "MS dumpbin"; then + # Gets list of data symbols to import. + lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + # Adjust the below global symbol transforms to fixup imported variables. + lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" + lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" + lt_c_name_lib_hook="\ + -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\ + -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'" +else + # Disable hooks by default. + lt_cv_sys_global_symbol_to_import= + lt_cdecl_hook= + lt_c_name_hook= + lt_c_name_lib_hook= +fi + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" +lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +$lt_cdecl_hook\ +" -e 's/^T .* \(.*\)$/extern int \1();/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" +lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +$lt_c_name_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" + +# Transform an extracted symbol line into symbol name with lib prefix and +# symbol address. +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +$lt_c_name_lib_hook\ +" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ +" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ +" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'" # Handle CRLF in mingw tool chain opt_cr= @@ -3708,21 +4011,24 @@ # Write the raw and C identifiers. if test "$lt_cv_nm_interface" = "MS dumpbin"; then - # Fake it for dumpbin and say T for any non-static function - # and D for any global variable. + # Fake it for dumpbin and say T for any non-static function, + # D for any global variable and I for any imported variable. # Also find C++ and __fastcall symbols from MSVC++, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ " /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ +" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\ +" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\ +" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ " {if(hide[section]) next};"\ -" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ +" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\ +" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\ +" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\ +" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" @@ -3762,11 +4068,11 @@ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then cat <<_LT_EOF > conftest.$ac_ext /* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ -#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) -/* DATA imports from DLLs on WIN32 con't be const, because runtime +#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE +/* DATA imports from DLLs on WIN32 can't be const, because runtime relocations are performed -- see ld's documentation on pseudo-relocs. */ # define LT@&t@_DLSYM_CONST -#elif defined(__osf__) +#elif defined __osf__ /* This system does not cope well with relocations in const data. */ # define LT@&t@_DLSYM_CONST #else @@ -3792,7 +4098,7 @@ { { "@PROGRAM@", (void *) 0 }, _LT_EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext + $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext cat <<\_LT_EOF >> conftest.$ac_ext {0, (void *) 0} }; @@ -3812,9 +4118,9 @@ mv conftest.$ac_objext conftstm.$ac_objext lt_globsym_save_LIBS=$LIBS lt_globsym_save_CFLAGS=$CFLAGS - LIBS="conftstm.$ac_objext" + LIBS=conftstm.$ac_objext CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then + if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then pipe_works=yes fi LIBS=$lt_globsym_save_LIBS @@ -3835,7 +4141,7 @@ rm -rf conftest* conftst* # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then + if test yes = "$pipe_works"; then break else lt_cv_sys_global_symbol_pipe= @@ -3862,12 +4168,16 @@ [Take the output of nm and produce a listing of raw symbols and C names]) _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], [Transform the output of nm in a proper C declaration]) +_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1], + [Transform the output of nm into a list of symbols to manually relocate]) _LT_DECL([global_symbol_to_c_name_address], [lt_cv_sys_global_symbol_to_c_name_address], [1], [Transform the output of nm in a C name address pair]) _LT_DECL([global_symbol_to_c_name_address_lib_prefix], [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], [Transform the output of nm in a C name address pair when lib prefix is needed]) +_LT_DECL([nm_interface], [lt_cv_nm_interface], [1], + [The name lister interface]) _LT_DECL([], [nm_file_list_spec], [1], [Specify filename containing input files for $NM]) ]) # _LT_CMD_GLOBAL_SYMBOLS @@ -3883,17 +4193,18 @@ m4_if([$1], [CXX], [ # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -3904,8 +4215,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -3921,6 +4232,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) # PIC is the default on this platform @@ -3970,7 +4286,7 @@ case $host_os in aix[[4-9]]*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4011,14 +4327,14 @@ case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - if test "$host_cpu" != ia64; then + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' + if test ia64 != "$host_cpu"; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' fi ;; aCC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' case $host_cpu in hppa*64*|ia64*) # +Z the default @@ -4047,7 +4363,7 @@ ;; esac ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # KAI C++ Compiler @@ -4055,7 +4371,7 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; ecpc* ) - # old Intel C++ for x86_64 which still supported -KPIC. + # old Intel C++ for x86_64, which still supported -KPIC. _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' @@ -4200,17 +4516,18 @@ fi ], [ - if test "$GCC" = yes; then + if test yes = "$GCC"; then _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' case $host_os in aix*) # All AIX code is PIC. - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ;; amigaos*) @@ -4221,8 +4538,8 @@ ;; m68k) # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. + # adding the '-m68020' flag to GCC prevents building anything better, + # like '-m68040'. _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; esac @@ -4239,6 +4556,11 @@ # (--disable-auto-import) libraries m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; darwin* | rhapsody*) @@ -4309,7 +4631,7 @@ case $host_os in aix*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # AIX 5 now supports IA64 processor _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' else @@ -4317,11 +4639,30 @@ fi ;; + darwin* | rhapsody*) + # PIC is the default on this platform + # Common symbols not allowed in MH_DYLIB files + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' + case $cc_basename in + nagfor*) + # NAG Fortran compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + esac + ;; + mingw* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) + case $host_os in + os2*) + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static' + ;; + esac ;; hpux9* | hpux10* | hpux11*) @@ -4337,7 +4678,7 @@ ;; esac # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' + _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive' ;; irix5* | irix6* | nonstopux*) @@ -4346,9 +4687,9 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. + # old Intel for x86_64, which still supported -KPIC. ecc*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4373,6 +4714,12 @@ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ;; + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) # Portland Group compilers (*not* the Pentium gcc compiler, # which looks to be a dead project) @@ -4470,7 +4817,7 @@ ;; sysv4*MP*) - if test -d /usr/nec ;then + if test -d /usr/nec; then _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' fi @@ -4499,7 +4846,7 @@ fi ]) case $host_os in - # For platforms which do not support PIC, -DPIC is meaningless: + # For platforms that do not support PIC, -DPIC is meaningless: *djgpp*) _LT_TAGVAR(lt_prog_compiler_pic, $1)= ;; @@ -4565,17 +4912,21 @@ case $host_os in aix[[4-9]]*) # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - # Also, AIX nm treats weak defined symbols like other global defined - # symbols, whereas GNU nm marks them as "W". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. 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") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) - _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" + _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; cygwin* | mingw* | cegcc*) case $cc_basename in @@ -4621,9 +4972,9 @@ # included in the symbol list _LT_TAGVAR(include_expsyms, $1)= # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. + # it will be wrapped by ' (' and ')$', so one must not match beginning or + # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc', + # as well as any symbol that contains 'd'. _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out # platforms (ab)use it in PIC code, but their linkers get confused if @@ -4639,7 +4990,7 @@ # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. - if test "$GCC" != yes; then + if test yes != "$GCC"; then with_gnu_ld=no fi ;; @@ -4647,7 +4998,7 @@ # we just hope/assume this is gcc and not c89 (= MSVC++) with_gnu_ld=yes ;; - openbsd*) + openbsd* | bitrig*) with_gnu_ld=no ;; esac @@ -4657,7 +5008,7 @@ # On some targets, GNU ld is compatible enough with the native linker # that we're better off using the native interface for both. lt_use_gnu_ld_interface=no - if test "$with_gnu_ld" = yes; then + if test yes = "$with_gnu_ld"; then case $host_os in aix*) # The AIX port of GNU ld has always aspired to compatibility @@ -4679,24 +5030,24 @@ esac fi - if test "$lt_use_gnu_ld_interface" = yes; then + if test yes = "$lt_use_gnu_ld_interface"; then # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' + wlarc='$wl' # Set some defaults for GNU ld with shared library support. These # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. runpath_var=LD_RUN_PATH - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # ancient GNU ld didn't support --whole-archive et. al. if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -4709,7 +5060,7 @@ case $host_os in aix[[3-9]]*) # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then + if test ia64 != "$host_cpu"; then _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -4728,7 +5079,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -4744,7 +5095,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4754,7 +5105,7 @@ # _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(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 @@ -4762,61 +5113,89 @@ _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) tmp_diet=no - if test "$host_os" = linux-dietlibc; then + if test linux-dietlibc = "$host_os"; then case $cc_basename in diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) esac fi if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ - && test "$tmp_diet" = no + && test no = "$tmp_diet" then tmp_addflag=' $pic_flag' 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; func_echo_all \"$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' + _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' tmp_addflag=' $pic_flag -Mnomain' ;; ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 tmp_addflag=' -i_dynamic' ;; @@ -4827,42 +5206,47 @@ lf95*) # Lahey Fortran 8.1 _LT_TAGVAR(whole_archive_flag_spec, $1)= tmp_sharedflag='--shared' ;; + nagfor*) # NAGFOR 5.3 + tmp_sharedflag='-Wl,-shared' ;; xl[[cC]]* | bgxl[[cC]]* | mpixl[[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(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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes tmp_sharedflag='-G' ;; *Sun\ F*) # Sun Fortran 8.3 tmp_sharedflag='-G' ;; esac - _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; 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~ - $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in + tcc*) + _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' + ;; xlf* | bgf* | bgxlf* | mpixlf*) # 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)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + if test yes = "$supports_anon_versioning"; 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' + 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' fi ;; esac @@ -4876,8 +5260,8 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' fi ;; @@ -4895,8 +5279,8 @@ _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4908,7 +5292,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 -*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot *** reliably create shared libraries on SCO systems. Therefore, libtool *** is disabling shared libraries support. We urge you to upgrade GNU *** binutils to release 2.16.91.0.3 or newer. Another option is to modify @@ -4923,9 +5307,9 @@ # DT_RUNPATH tag from executables and libraries. But doing so # requires that you compile everything twice, which is a pain. if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -4942,15 +5326,15 @@ *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi ;; esac - if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then + if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then runpath_var= _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= _LT_TAGVAR(export_dynamic_flag_spec, $1)= @@ -4966,7 +5350,7 @@ # Note: this linker hardcodes the directories in LIBPATH if there # are no directories specified by -L. _LT_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then + if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then # Neither direct hardcoding nor static linking is supported with a # broken collect2. _LT_TAGVAR(hardcode_direct, $1)=unsupported @@ -4974,34 +5358,57 @@ ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= 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". + # -C means demangle to GNU nm, but means don't demangle to AIX nm. + # Without the "-l" option, or with the "-B" option, AIX nm treats + # weak defined symbols like other global defined symbols, whereas + # GNU nm marks them as "W". + # While the 'weak' keyword is ignored in the Export File, we need + # it in the Import File for the 'aix-soname' feature, so we have + # to replace the "-B" option with "-P" for AIX nm. 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") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { 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' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then aix_use_runtimelinking=yes break fi done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -5020,13 +5427,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # traditional, no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GCC" = yes; then + if test yes = "$GCC"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -5045,61 +5460,80 @@ ;; esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag="$shared_flag "'$wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. _LT_TAGVAR(allow_undefined_flag, $1)='-berok' # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_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(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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; 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' + _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 _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' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared libraries. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -5108,7 +5542,7 @@ case $host_cpu in powerpc) # see comment about AmigaOS4 .so support - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='' ;; m68k) @@ -5138,16 +5572,17 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes @@ -5156,18 +5591,18 @@ # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # Assume MSVC wrapper @@ -5176,7 +5611,7 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames=' # The linker will automatically build a .lib file if we build a DLL. @@ -5226,33 +5661,33 @@ ;; hpux9*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; hpux10*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + if test yes,no = "$GCC,$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' fi - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5260,25 +5695,25 @@ ;; hpux11*) - if test "$GCC" = yes && test "$with_gnu_ld" = no; then + if test yes,no = "$GCC,$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ;; esac else case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ;; *) m4_if($1, [], [ @@ -5286,14 +5721,14 @@ # (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)='$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 - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in @@ -5304,7 +5739,7 @@ *) _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -5315,16 +5750,16 @@ ;; irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' # 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. # This should be the same for all languages, so no per-tag cache variable. AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol], [lt_cv_irix_exported_symbol], - [save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" + [save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null" AC_LINK_IFELSE( [AC_LANG_SOURCE( [AC_LANG_CASE([C], [[int foo (void) { return 0; }]], @@ -5337,21 +5772,31 @@ end]])])], [lt_cv_irix_exported_symbol=yes], [lt_cv_irix_exported_symbol=no]) - LDFLAGS="$save_LDFLAGS"]) - if test "$lt_cv_irix_exported_symbol" = yes; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' + LDFLAGS=$save_LDFLAGS]) + if test yes = "$lt_cv_irix_exported_symbol"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi 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" && 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' fi _LT_TAGVAR(archive_cmds_need_lc, $1)='no' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes _LT_TAGVAR(link_all_deplibs, $1)=yes ;; + linux*) + case $cc_basename in + tcc*) + # Fabrice Bellard et al's Tiny C Compiler + _LT_TAGVAR(ld_shlibs, $1)=yes + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + ;; + esac + ;; + netbsd*) 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 @@ -5366,7 +5811,7 @@ newsos6) _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; @@ -5374,27 +5819,19 @@ *nto* | *qnx*) ;; - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes - if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' fi else _LT_TAGVAR(ld_shlibs, $1)=no @@ -5405,33 +5842,53 @@ _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(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; 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' + if test yes = "$GCC"; 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' 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" && func_echo_all "-set_version $verstring"` -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' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: ;; 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} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + if test yes = "$GCC"; then + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' + _LT_TAGVAR(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" && func_echo_all "-set_version $verstring"` -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 "-set_version $verstring"` -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' @@ -5442,24 +5899,24 @@ solaris*) _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' - if test "$GCC" = yes; then - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' else case `$CC -V 2>&1` in *"Compilers 5.0"*) wlarc='' - _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' + _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' + $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ;; *) - wlarc='${wl}' - _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' + wlarc='$wl' + _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ;; esac fi @@ -5469,11 +5926,11 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. GCC discards it without `$wl', + # but understands '-z linker_flag'. GCC discards it without '$wl', # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - if test "$GCC" = yes; then - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + if test yes = "$GCC"; then + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' else _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' fi @@ -5483,10 +5940,10 @@ ;; sunos4*) - if test "x$host_vendor" = xsequent; then + if test sequent = "$host_vendor"; then # Use $CC to link under sequent, because it throws in some extra .o # files that make .init and .fini sections work. - _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags' else _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' fi @@ -5535,43 +5992,43 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _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(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' fi ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' - if test "$GCC" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + if test yes = "$GCC"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' else - _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(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' fi ;; @@ -5586,17 +6043,17 @@ ;; esac - if test x$host_vendor = xsni; then + if test sni = "$host_vendor"; then case $host in sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym' ;; esac fi fi ]) AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no +test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no _LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld @@ -5613,7 +6070,7 @@ # Assume -lc should be added _LT_TAGVAR(archive_cmds_need_lc, $1)=yes - if test "$enable_shared" = yes && test "$GCC" = yes; then + if test yes,yes = "$GCC,$enable_shared"; then case $_LT_TAGVAR(archive_cmds, $1) in *'~'*) # FIXME: we may have to deal with multi-command sequences. @@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary]) _LT_TAGDECL([], [hardcode_direct_absolute], [0], - [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes + [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting ${shlibpath_var} if the + "absolute", i.e impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -5739,10 +6196,10 @@ # ------------------------ # 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'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_C_CONFIG], [m4_require([_LT_DECL_EGREP])dnl -lt_save_CC="$CC" +lt_save_CC=$CC AC_LANG_PUSH(C) # Source file extension for C test sources. @@ -5782,18 +6239,18 @@ LT_SYS_DLOPEN_SELF _LT_CMD_STRIPLIB - # Report which library types will actually be built + # Report what library types will actually be built AC_MSG_CHECKING([if libtool supports shared libraries]) AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' @@ -5801,8 +6258,12 @@ ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -5810,13 +6271,13 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) _LT_CONFIG($1) fi AC_LANG_POP -CC="$lt_save_CC" +CC=$lt_save_CC ])# _LT_LANG_C_CONFIG @@ -5824,14 +6285,14 @@ # -------------------------- # 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'. +# the compiler configuration to 'libtool'. m4_defun([_LT_LANG_CXX_CONFIG], [m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_DECL_EGREP])dnl m4_require([_LT_PATH_MANIFEST_TOOL])dnl -if test -n "$CXX" && ( test "X$CXX" != "Xno" && - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then +if test -n "$CXX" && ( test no != "$CXX" && + ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) || + (test g++ != "$CXX"))); then AC_PROG_CXXCPP else _lt_caught_CXX_error=yes @@ -5873,7 +6334,7 @@ # the CXX compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_caught_CXX_error" != yes; then +if test yes != "$_lt_caught_CXX_error"; then # Code to be used in simple compile tests lt_simple_compile_test_code="int some_variable = 0;" @@ -5915,35 +6376,35 @@ if test -n "$compiler"; then # We don't want -fno-exception when compiling C++ code, so set the # no_builtin_flag separately - if test "$GXX" = yes; then + if test yes = "$GXX"; then _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' else _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= fi - if test "$GXX" = yes; then + if test yes = "$GXX"; then # Set up default GNU C++ configuration LT_PATH_LD # Check if GNU C++ uses GNU ld as the underlying linker, since the # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + if test yes = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # If archive_cmds runs LD, not CC, wlarc should be empty # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to # investigate it a little bit more. (MM) - wlarc='${wl}' + wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. if eval "`$CC -print-prog-name=ld` --help 2>&1" | $GREP 'no-whole-archive' > /dev/null; then - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= fi @@ -5979,18 +6440,30 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aix[[4-9]]*) - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. aix_use_runtimelinking=no exp_sym_flag='-Bexport' - no_entry_flag="" + no_entry_flag= else aix_use_runtimelinking=no # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. + # have runtime linking enabled, and use it for executables. + # For shared libraries, we enable/disable runtime linking + # depending on the kind of the shared library created - + # when "with_aix_soname,aix_use_runtimelinking" is: + # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables + # "aix,yes" lib.so shared, rtl:yes, for executables + # lib.a static archive + # "both,no" lib.so.V(shr.o) shared, rtl:yes + # lib.a(lib.so.V) shared, rtl:no, for executables + # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a(lib.so.V) shared, rtl:no + # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables + # lib.a static archive case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) for ld_flag in $LDFLAGS; do case $ld_flag in @@ -6000,6 +6473,13 @@ ;; esac done + if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then + # With aix-soname=svr4, we create the lib.so.V shared archives only, + # so we don't have lib.a shared libs to link our executables. + # We have to force runtime linking in this case. + aix_use_runtimelinking=yes + LDFLAGS="$LDFLAGS -Wl,-brtl" + fi ;; esac @@ -6018,13 +6498,21 @@ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' + _LT_TAGVAR(file_list_spec, $1)='$wl-f,' + case $with_aix_soname,$aix_use_runtimelinking in + aix,*) ;; # no import file + svr4,* | *,yes) # use import file + # The Import File defines what to hardcode. + _LT_TAGVAR(hardcode_direct, $1)=no + _LT_TAGVAR(hardcode_direct_absolute, $1)=no + ;; + esac - if test "$GXX" = yes; then + if test yes = "$GXX"; then case $host_os in aix4.[[012]]|aix4.[[012]].*) # We only want to do this on AIX 4.2 and lower, the check # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` + collect2name=`$CC -print-prog-name=collect2` if test -f "$collect2name" && strings "$collect2name" | $GREP resolve_lib_name >/dev/null then @@ -6042,64 +6530,84 @@ fi esac shared_flag='-shared' - if test "$aix_use_runtimelinking" = yes; then - shared_flag="$shared_flag "'${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag=$shared_flag' $wl-G' fi + # Need to ensure runtime linking is disabled for the traditional + # shared library, or the linker may eventually find shared libraries + # /with/ Import File - we do not want to mix them. + shared_flag_aix='-shared' + shared_flag_svr4='-shared $wl-G' else # not using gcc - if test "$host_cpu" = ia64; then + if test ia64 = "$host_cpu"; then # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release # chokes on -Wl,-G. The following line is correct: shared_flag='-G' else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' + if test yes = "$aix_use_runtimelinking"; then + shared_flag='$wl-G' else - shared_flag='${wl}-bM:SRE' + shared_flag='$wl-bM:SRE' fi + shared_flag_aix='$wl-bM:SRE' + shared_flag_svr4='$wl-G' fi fi - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall' # It seems that -bexpall does not export symbols beginning with # underscore (_), so it is better to generate a list of symbols to # export. _LT_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then + if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then # Warning - without using the other runtime loading flags (-brtl), # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(allow_undefined_flag, $1)='-berok' + # The "-G" linker flag allows undefined symbols. + _LT_TAGVAR(no_undefined_flag, $1)='-bernotok' # Determine the default libpath from the value encoded in an empty # executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _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 -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; 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' + if test ia64 = "$host_cpu"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib' _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" - _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" + _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols" else # Determine the default libpath from the value encoded in an # empty executable. _LT_SYS_MODULE_PATH_AIX([$1]) - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath" # Warning - without using the other run time loading flags, # -berok will link without error, but may produce a broken library. - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - if test "$with_gnu_ld" = yes; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok' + _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok' + if test yes = "$with_gnu_ld"; 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' + _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 _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' + _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d' + # -brtl affects multiple linker settings, -berok does not and is overridden later + compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`' + if test svr4 != "$with_aix_soname"; then + # This is similar to how AIX traditionally builds its shared + # libraries. Need -bnortl late, we may have -brtl in LDFLAGS. + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname' + fi + if test aix != "$with_aix_soname"; then + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp' + else + # used by -dlpreopen to get the symbols + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir' + fi + _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d' fi fi ;; @@ -6109,7 +6617,7 @@ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Joseph Beckenbach says some releases of gcc # support --undefined. This deserves some investigation. FIXME - _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6137,57 +6645,58 @@ # Tell ltmain to make .lib files, not .a files. libext=lib # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" + shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames=' - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp; - else - $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp; - fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ - linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp "$export_symbols" "$output_objdir/$soname.def"; + echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; + else + $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; + fi~ + $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~ - lt_tool_outputfile="@TOOL_OUTPUT@"~ - case $lt_outputfile in - *.exe|*.EXE) ;; - *) - lt_outputfile="$lt_outputfile.exe" - lt_tool_outputfile="$lt_tool_outputfile.exe" - ;; - esac~ - func_to_tool_file "$lt_outputfile"~ - if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then - $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; - $RM "$lt_outputfile.manifest"; - fi' + lt_tool_outputfile="@TOOL_OUTPUT@"~ + case $lt_outputfile in + *.exe|*.EXE) ;; + *) + lt_outputfile=$lt_outputfile.exe + lt_tool_outputfile=$lt_tool_outputfile.exe + ;; + esac~ + func_to_tool_file "$lt_outputfile"~ + if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then + $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1; + $RM "$lt_outputfile.manifest"; + fi' ;; *) # g++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=no _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' + # If the export-symbols file already is a .def file, use it as + # is; otherwise, prepend EXPORTS... + _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then + cp $export_symbols $output_objdir/$soname.def; + else + echo EXPORTS > $output_objdir/$soname.def; + cat $export_symbols >> $output_objdir/$soname.def; + fi~ + $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' else _LT_TAGVAR(ld_shlibs, $1)=no fi @@ -6198,6 +6707,34 @@ _LT_DARWIN_LINKER_FEATURES($1) ;; + os2*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + _LT_TAGVAR(hardcode_minus_L, $1)=yes + _LT_TAGVAR(allow_undefined_flag, $1)=unsupported + shrext_cmds=.dll + _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~ + $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~ + $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~ + $ECHO EXPORTS >> $output_objdir/$libname.def~ + prefix_cmds="$SED"~ + if test EXPORTS = "`$SED 1q $export_symbols`"; then + prefix_cmds="$prefix_cmds -e 1d"; + fi~ + prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~ + cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ + $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ + emximp -o $lib $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + ;; + dgux*) case $cc_basename in ec++*) @@ -6232,18 +6769,15 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - gnu*) - ;; - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + _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_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, # but as the default @@ -6255,7 +6789,7 @@ _LT_TAGVAR(ld_shlibs, $1)=no ;; aCC*) - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6264,11 +6798,11 @@ # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - 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; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' + if test yes = "$GXX"; then + _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib' else # FIXME: insert proper C++ library support _LT_TAGVAR(ld_shlibs, $1)=no @@ -6278,15 +6812,15 @@ ;; hpux10*|hpux11*) - if test $with_gnu_ld = no; then - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in hppa*64*|ia64*) ;; *) - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' ;; esac fi @@ -6312,13 +6846,13 @@ aCC*) case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac # Commands to make compiler produce verbose output that lists @@ -6329,20 +6863,20 @@ # 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; func_echo_all "$list"' ;; *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then case $host_cpu in hppa*64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; ia64*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;; esac fi @@ -6357,22 +6891,22 @@ interix[[3-9]]*) _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E' # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. # Instead, shared libraries are loaded at an image base (0x10000000 by # default) and relocated if they conflict, which is a slow very memory # consuming and fragmenting process. To avoid this, we pick a random, # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) 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" && func_echo_all "-set_version $verstring"` -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 @@ -6381,22 +6915,22 @@ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ;; *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + if test yes = "$GXX"; then + if test no = "$with_gnu_ld"; then + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' else - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib' fi fi _LT_TAGVAR(link_all_deplibs, $1)=yes ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(inherit_rpath, $1)=yes ;; - linux* | k*bsd*-gnu | kopensolaris*-gnu) + linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) case $cc_basename in KCC*) # Kuck and Associates, Inc. (KAI) C++ Compiler @@ -6404,8 +6938,8 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. @@ -6414,10 +6948,10 @@ # 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; func_echo_all "$list"' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' # Archives containing C++ object files must be created using # "CC -Bstatic", where "CC" is the KAI C++ compiler. @@ -6431,59 +6965,59 @@ # earlier do not add the objects themselves. case `$CC -V 2>&1` in *"Version 7."*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= case $host_cpu in ia64*) tmp_idyn=' -i_dynamic';; esac - _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib' ;; esac _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive' ;; pgCC* | pgcpp*) # Portland Group C++ compiler case `$CC -V` in *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`"' + rm -rf $tpldir~ + $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ + compile_command="$compile_command `find $tpldir -name \*.o | sort | $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`~ - $RANLIB $oldlib' + 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`~ + $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' + 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' _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' + 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' ;; *) # Version 6 and above 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' + _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' ;; esac - _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(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' ;; cxx*) # Compaq C++ - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols' runpath_var=LD_RUN_PATH _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' @@ -6497,18 +7031,18 @@ # 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=`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' ;; xl* | mpixl* | bgxl*) # 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' - _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - if test "x$supports_anon_versioning" = xyes; then + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic' + _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' + if test yes = "$supports_anon_versioning"; 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~ - $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + echo "local: *; };" >> $output_objdir/$libname.ver~ + $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) @@ -6516,10 +7050,10 @@ *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _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(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; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes # Not sure whether something based on @@ -6577,22 +7111,17 @@ _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd2*) - # C++ shared libraries are fairly broken - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - - openbsd*) + openbsd* | bitrig*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib' + _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 else @@ -6608,9 +7137,9 @@ # KCC will only create a shared library if the output file # ends with ".so" (or ".sl" for HP-UX), so rename the library # to its proper name (with version) after linking. - _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' + _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Archives containing C++ object files must be created using @@ -6628,17 +7157,17 @@ cxx*) 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _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(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" && func_echo_all "-set_version $verstring"` -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~ - $RM $lib.exp' + 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~ + $RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ;; esac @@ -6653,21 +7182,21 @@ # 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=`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"' ;; *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' + if test yes,no = "$GXX,$with_gnu_ld"; 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" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib' ;; esac - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: # Commands to make compiler produce verbose output that lists @@ -6713,9 +7242,9 @@ # Sun C++ 4.2, 5.x and Centerline C++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' - _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_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)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6723,7 +7252,7 @@ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) # The compiler driver will combine and reorder linker options, - # but understands `-z linker_flag'. + # but understands '-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; @@ -6740,30 +7269,30 @@ ;; gcx*) # Green Hills C++ Compiler - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' # The C++ compiler must be used to create the archive. _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ;; *) # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' + if test yes,no = "$GXX,$with_gnu_ld"; then + _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs' if $CC --version | $GREP -v '^2\.7' > /dev/null; then - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' else - # g++ 2.7 appears to require `-G' NOT `-shared' on this + # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. - _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' + _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' + $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when @@ -6771,11 +7300,11 @@ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' fi - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract' ;; esac fi @@ -6784,52 +7313,52 @@ ;; sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no runpath_var='LD_RUN_PATH' case $cc_basename in 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(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(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; sysv5* | sco3.2v5* | sco5v6*) - # Note: We can NOT use -z defs as we might desire, because we do not + # Note: We CANNOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would # ever link correctly. If we're not using GNU ld we use -z text # though, which does catch some bad symbols but isn't as heavy-handed # as -z defs. - _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' - _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' + _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text' + _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=':' _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' + _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport' runpath_var='LD_RUN_PATH' case $cc_basename in 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(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(old_archive_cmds, $1)" _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~ - '"$_LT_TAGVAR(reload_cmds, $1)" + '"$_LT_TAGVAR(reload_cmds, $1)" ;; *) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' - _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ;; esac ;; @@ -6860,10 +7389,10 @@ esac AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) - test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no + test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no - _LT_TAGVAR(GCC, $1)="$GXX" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$GXX + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -6890,7 +7419,7 @@ lt_cv_path_LD=$lt_save_path_LD lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -fi # test "$_lt_caught_CXX_error" != yes +fi # test yes != "$_lt_caught_CXX_error" AC_LANG_POP ])# _LT_LANG_CXX_CONFIG @@ -6912,13 +7441,14 @@ AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH]) func_stripname_cnf () { - case ${2} in - .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; - *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + case @S|@2 in + .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;; + *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;; esac } # func_stripname_cnf ])# _LT_FUNC_STRIPNAME_CNF + # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) # --------------------------------- # Figure out "hidden" library dependencies from verbose @@ -7002,13 +7532,13 @@ pre_test_object_deps_done=no for p in `eval "$output_verbose_link_cmd"`; do - case ${prev}${p} in + case $prev$p in -L* | -R* | -l*) # Some compilers place space between "-{L,R}" and the path. # Remove the space. - if test $p = "-L" || - test $p = "-R"; then + if test x-L = "$p" || + test x-R = "$p"; then prev=$p continue fi @@ -7024,16 +7554,16 @@ case $p in =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;; esac - if test "$pre_test_object_deps_done" = no; then - case ${prev} in + if test no = "$pre_test_object_deps_done"; then + case $prev in -L | -R) # Internal compiler library paths should come after those # provided the user. The postdeps already come after the # user supplied libs so there is no need to process them. if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then - _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p else - _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" + _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p" fi ;; # The "-l" case would never come before the object being @@ -7041,9 +7571,9 @@ esac else if test -z "$_LT_TAGVAR(postdeps, $1)"; then - _LT_TAGVAR(postdeps, $1)="${prev}${p}" + _LT_TAGVAR(postdeps, $1)=$prev$p else - _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" + _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p" fi fi prev= @@ -7058,15 +7588,15 @@ continue fi - if test "$pre_test_object_deps_done" = no; then + if test no = "$pre_test_object_deps_done"; then if test -z "$_LT_TAGVAR(predep_objects, $1)"; then - _LT_TAGVAR(predep_objects, $1)="$p" + _LT_TAGVAR(predep_objects, $1)=$p else _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" fi else if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then - _LT_TAGVAR(postdep_objects, $1)="$p" + _LT_TAGVAR(postdep_objects, $1)=$p else _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" fi @@ -7097,51 +7627,6 @@ _LT_TAGVAR(postdep_objects,$1)= _LT_TAGVAR(postdeps,$1)= ;; - -linux*) - case `$CC -V 2>&1 | sed 5q` in - *Sun\ C*) - # Sun C++ 5.9 - - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; - -solaris*) - case $cc_basename in - CC* | sunCC*) - # The more standards-conforming stlport4 library is - # incompatible with the Cstd library. Avoid specifying - # it if it's in CXXFLAGS. Ignore libCrun as - # -library=stlport4 depends on it. - case " $CXX $CXXFLAGS " in - *" -library=stlport4 "*) - solaris_use_stlport4=yes - ;; - esac - - # Adding this requires a known-good setup of shared libraries for - # Sun compiler versions before 5.6, else PIC objects from an old - # archive will be linked into the output, leading to subtle bugs. - if test "$solaris_use_stlport4" != yes; then - _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' - fi - ;; - esac - ;; esac ]) @@ -7150,7 +7635,7 @@ esac _LT_TAGVAR(compiler_lib_search_dirs, $1)= if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then - _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` + _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'` fi _LT_TAGDECL([], [compiler_lib_search_dirs], [1], [The directories searched by this compiler when creating a shared library]) @@ -7170,10 +7655,10 @@ # -------------------------- # 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'. +# 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 +if test -z "$F77" || test no = "$F77"; then _lt_disable_F77=yes fi @@ -7210,7 +7695,7 @@ # the F77 compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_F77" != yes; then +if test yes != "$_lt_disable_F77"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7232,7 +7717,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${F77-"f77"} @@ -7246,21 +7731,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7268,11 +7757,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$G77" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$G77 + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7289,9 +7778,9 @@ fi # test -n "$compiler" GCC=$lt_save_GCC - CC="$lt_save_CC" - CFLAGS="$lt_save_CFLAGS" -fi # test "$_lt_disable_F77" != yes + CC=$lt_save_CC + CFLAGS=$lt_save_CFLAGS +fi # test yes != "$_lt_disable_F77" AC_LANG_POP ])# _LT_LANG_F77_CONFIG @@ -7301,11 +7790,11 @@ # ------------------------- # 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'. +# 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 +if test -z "$FC" || test no = "$FC"; then _lt_disable_FC=yes fi @@ -7342,7 +7831,7 @@ # the FC compiler isn't working. Some variables (like enable_shared) # are currently assumed to apply to all compilers on this platform, # and will be corrupted by setting them based on a non-working compiler. -if test "$_lt_disable_FC" != yes; then +if test yes != "$_lt_disable_FC"; then # Code to be used in simple compile tests lt_simple_compile_test_code="\ subroutine t @@ -7364,7 +7853,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. - lt_save_CC="$CC" + lt_save_CC=$CC lt_save_GCC=$GCC lt_save_CFLAGS=$CFLAGS CC=${FC-"f95"} @@ -7380,21 +7869,25 @@ AC_MSG_RESULT([$can_build_shared]) AC_MSG_CHECKING([whether to build shared libraries]) - test "$can_build_shared" = "no" && enable_shared=no + test no = "$can_build_shared" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and # are all built from PIC. case $host_os in aix3*) - test "$enable_shared" = yes && enable_static=no + test yes = "$enable_shared" && enable_static=no if test -n "$RANLIB"; then archive_cmds="$archive_cmds~\$RANLIB \$lib" postinstall_cmds='$RANLIB $lib' fi ;; aix[[4-9]]*) - if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then - test "$enable_shared" = yes && enable_static=no + if test ia64 != "$host_cpu"; then + case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in + yes,aix,yes) ;; # shared object as lib.so file only + yes,svr4,*) ;; # shared object as lib.so archive member only + yes,*) enable_static=no ;; # shared object in lib.a archive as well + esac fi ;; esac @@ -7402,11 +7895,11 @@ AC_MSG_CHECKING([whether to build static libraries]) # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes + test yes = "$enable_shared" || enable_static=yes AC_MSG_RESULT([$enable_static]) - _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" - _LT_TAGVAR(LD, $1)="$LD" + _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu + _LT_TAGVAR(LD, $1)=$LD ## CAVEAT EMPTOR: ## There is no encapsulation within the following macros, do not change @@ -7426,7 +7919,7 @@ GCC=$lt_save_GCC CC=$lt_save_CC CFLAGS=$lt_save_CFLAGS -fi # test "$_lt_disable_FC" != yes +fi # test yes != "$_lt_disable_FC" AC_LANG_POP ])# _LT_LANG_FC_CONFIG @@ -7436,7 +7929,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Java Compiler compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GCJ_CONFIG], [AC_REQUIRE([LT_PROG_GCJ])dnl AC_LANG_SAVE @@ -7470,7 +7963,7 @@ CFLAGS=$GCJFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # GCJ did not exist at the time GCC didn't implicitly link libc in. @@ -7507,7 +8000,7 @@ # -------------------------- # Ensure that the configuration variables for the GNU Go compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_GO_CONFIG], [AC_REQUIRE([LT_PROG_GO])dnl AC_LANG_SAVE @@ -7541,7 +8034,7 @@ CFLAGS=$GOFLAGS compiler=$CC _LT_TAGVAR(compiler, $1)=$CC -_LT_TAGVAR(LD, $1)="$LD" +_LT_TAGVAR(LD, $1)=$LD _LT_CC_BASENAME([$compiler]) # Go did not exist at the time GCC didn't implicitly link libc in. @@ -7578,7 +8071,7 @@ # ------------------------- # Ensure that the configuration variables for the Windows resource compiler # are suitably defined. These variables are subsequently used by _LT_CONFIG -# to write the compiler configuration to `libtool'. +# to write the compiler configuration to 'libtool'. m4_defun([_LT_LANG_RC_CONFIG], [AC_REQUIRE([LT_PROG_RC])dnl AC_LANG_SAVE @@ -7594,7 +8087,7 @@ lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" +lt_simple_link_test_code=$lt_simple_compile_test_code # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_TAG_COMPILER @@ -7604,7 +8097,7 @@ _LT_LINKER_BOILERPLATE # Allow CC to be a program name with arguments. -lt_save_CC="$CC" +lt_save_CC=$CC lt_save_CFLAGS=$CFLAGS lt_save_GCC=$GCC GCC= @@ -7633,7 +8126,7 @@ [m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj,) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" + test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2" AC_SUBST(GCJFLAGS)])])[]dnl ]) @@ -7744,7 +8237,7 @@ # Add /usr/xpg4/bin/sed as it is typically found on Solaris # along with /bin/sed that truncates output. for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && continue + test ! -f "$lt_ac_sed" && continue cat /dev/null > conftest.in lt_ac_count=0 echo $ECHO_N "0123456789$ECHO_C" >conftest.in @@ -7761,9 +8254,9 @@ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break cmp -s conftest.out conftest.nl || break # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break + test 10 -lt "$lt_ac_count" && break lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then + if test "$lt_ac_count" -gt "$lt_ac_max"; then lt_ac_max=$lt_ac_count lt_cv_path_SED=$lt_ac_sed fi @@ -7787,27 +8280,7 @@ # Find out whether the shell is Bourne or XSI compatible, # or has some other useful features. m4_defun([_LT_CHECK_SHELL_FEATURES], -[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -# Try some XSI features -xsi_shell=no -( _lt_dummy="a/b/c" - test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \ - = c,a/b,b/c, \ - && eval 'test $(( 1 + 1 )) -eq 2 \ - && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ - && xsi_shell=yes -AC_MSG_RESULT([$xsi_shell]) -_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) - -AC_MSG_CHECKING([whether the shell understands "+="]) -lt_shell_append=no -( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ - >/dev/null 2>&1 \ - && lt_shell_append=yes -AC_MSG_RESULT([$lt_shell_append]) -_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) - -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then +[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then lt_unset=unset else lt_unset=false @@ -7831,102 +8304,9 @@ ])# _LT_CHECK_SHELL_FEATURES -# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY) -# ------------------------------------------------------ -# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and -# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY. -m4_defun([_LT_PROG_FUNCTION_REPLACE], -[dnl { -sed -e '/^$1 ()$/,/^} # $1 /c\ -$1 ()\ -{\ -m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1]) -} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") -test 0 -eq $? || _lt_function_replace_fail=: -]) - - -# _LT_PROG_REPLACE_SHELLFNS -# ------------------------- -# Replace existing portable implementations of several shell functions with -# equivalent extended shell implementations where those features are available.. -m4_defun([_LT_PROG_REPLACE_SHELLFNS], -[if test x"$xsi_shell" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl - case ${1} in - */*) func_dirname_result="${1%/*}${2}" ;; - * ) func_dirname_result="${3}" ;; - esac - func_basename_result="${1##*/}"]) - - _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl - # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are - # positional parameters, so assign one to ordinary parameter first. - func_stripname_result=${3} - func_stripname_result=${func_stripname_result#"${1}"} - func_stripname_result=${func_stripname_result%"${2}"}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl - func_split_long_opt_name=${1%%=*} - func_split_long_opt_arg=${1#*=}]) - - _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl - func_split_short_opt_arg=${1#??} - func_split_short_opt_name=${1%"$func_split_short_opt_arg"}]) - - _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl - case ${1} in - *.lo) func_lo2o_result=${1%.lo}.${objext} ;; - *) func_lo2o_result=${1} ;; - esac]) - - _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo]) - - _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))]) - - _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}]) -fi - -if test x"$lt_shell_append" = xyes; then - _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"]) - - _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl - func_quote_for_eval "${2}" -dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \ - eval "${1}+=\\\\ \\$func_quote_for_eval_result"]) - - # Save a `func_append' function call where possible by direct use of '+=' - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -else - # Save a `func_append' function call even when '+=' is not available - sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ - && mv -f "$cfgfile.tmp" "$cfgfile" \ - || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") - test 0 -eq $? || _lt_function_replace_fail=: -fi - -if test x"$_lt_function_replace_fail" = x":"; then - AC_MSG_WARN([Unable to substitute extended shell functions in $ofile]) -fi -]) - # _LT_PATH_CONVERSION_FUNCTIONS # ----------------------------- -# Determine which file name conversion functions should be used by +# Determine what file name conversion functions should be used by # func_to_host_file (and, implicitly, by func_to_host_path). These are needed # for certain cross-compile configurations and native mingw. m4_defun([_LT_PATH_CONVERSION_FUNCTIONS], diff -Nru libsoup2.4-2.52.2/m4/lt~obsolete.m4 libsoup2.4-2.54.1/m4/lt~obsolete.m4 --- libsoup2.4-2.52.2/m4/lt~obsolete.m4 2015-11-09 20:25:01.000000000 +0000 +++ libsoup2.4-2.54.1/m4/lt~obsolete.m4 2016-04-26 12:36:08.000000000 +0000 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -Nru libsoup2.4-2.52.2/m4/ltoptions.m4 libsoup2.4-2.54.1/m4/ltoptions.m4 --- libsoup2.4-2.52.2/m4/ltoptions.m4 2015-11-09 20:25:01.000000000 +0000 +++ libsoup2.4-2.54.1/m4/ltoptions.m4 2016-04-26 12:36:08.000000000 +0000 @@ -1,14 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2015 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 8 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -29,7 +29,7 @@ [m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), _LT_MANGLE_DEFUN([$1], [$2]), - [m4_warning([Unknown $1 option `$2'])])[]dnl + [m4_warning([Unknown $1 option '$2'])])[]dnl ]) @@ -75,13 +75,15 @@ dnl dnl If no reference was made to various pairs of opposing options, then dnl we run the default mode handler for the pair. For example, if neither - dnl `shared' nor `disable-shared' was passed, we enable building of shared + dnl 'shared' nor 'disable-shared' was passed, we enable building of shared dnl archives by default: _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], - [_LT_ENABLE_FAST_INSTALL]) + [_LT_ENABLE_FAST_INSTALL]) + _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4], + [_LT_WITH_AIX_SONAME([aix])]) ]) ])# _LT_SET_OPTIONS @@ -112,7 +114,7 @@ [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `dlopen' option into LT_INIT's first parameter.]) +put the 'dlopen' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -148,7 +150,7 @@ _LT_SET_OPTION([LT_INIT], [win32-dll]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `win32-dll' option into LT_INIT's first parameter.]) +put the 'win32-dll' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -157,9 +159,9 @@ # _LT_ENABLE_SHARED([DEFAULT]) # ---------------------------- -# implement the --enable-shared flag, and supports the `shared' and -# `disable-shared' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-shared flag, and supports the 'shared' and +# 'disable-shared' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_SHARED], [m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([shared], @@ -172,14 +174,14 @@ *) enable_shared=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_shared=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) @@ -211,9 +213,9 @@ # _LT_ENABLE_STATIC([DEFAULT]) # ---------------------------- -# implement the --enable-static flag, and support the `static' and -# `disable-static' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-static flag, and support the 'static' and +# 'disable-static' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_STATIC], [m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([static], @@ -226,14 +228,14 @@ *) enable_static=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_static=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_static=]_LT_ENABLE_STATIC_DEFAULT) @@ -265,9 +267,9 @@ # _LT_ENABLE_FAST_INSTALL([DEFAULT]) # ---------------------------------- -# implement the --enable-fast-install flag, and support the `fast-install' -# and `disable-fast-install' LT_INIT options. -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. +# implement the --enable-fast-install flag, and support the 'fast-install' +# and 'disable-fast-install' LT_INIT options. +# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'. m4_define([_LT_ENABLE_FAST_INSTALL], [m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl AC_ARG_ENABLE([fast-install], @@ -280,14 +282,14 @@ *) enable_fast_install=no # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for pkg in $enableval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$pkg" = "X$p"; then enable_fast_install=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) @@ -304,14 +306,14 @@ [_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `fast-install' option into LT_INIT's first parameter.]) +the 'fast-install' option into LT_INIT's first parameter.]) ]) AU_DEFUN([AC_DISABLE_FAST_INSTALL], [_LT_SET_OPTION([LT_INIT], [disable-fast-install]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you put -the `disable-fast-install' option into LT_INIT's first parameter.]) +the 'disable-fast-install' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: @@ -319,11 +321,64 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) +# _LT_WITH_AIX_SONAME([DEFAULT]) +# ---------------------------------- +# implement the --with-aix-soname flag, and support the `aix-soname=aix' +# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT +# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'. +m4_define([_LT_WITH_AIX_SONAME], +[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl +shared_archive_member_spec= +case $host,$enable_shared in +power*-*-aix[[5-9]]*,yes) + AC_MSG_CHECKING([which variant of shared library versioning to provide]) + AC_ARG_WITH([aix-soname], + [AS_HELP_STRING([--with-aix-soname=aix|svr4|both], + [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])], + [case $withval in + aix|svr4|both) + ;; + *) + AC_MSG_ERROR([Unknown argument to --with-aix-soname]) + ;; + esac + lt_cv_with_aix_soname=$with_aix_soname], + [AC_CACHE_VAL([lt_cv_with_aix_soname], + [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT) + with_aix_soname=$lt_cv_with_aix_soname]) + AC_MSG_RESULT([$with_aix_soname]) + if test aix != "$with_aix_soname"; then + # For the AIX way of multilib, we name the shared archive member + # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o', + # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File. + # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag, + # the AIX toolchain works better with OBJECT_MODE set (default 32). + if test 64 = "${OBJECT_MODE-32}"; then + shared_archive_member_spec=shr_64 + else + shared_archive_member_spec=shr + fi + fi + ;; +*) + with_aix_soname=aix + ;; +esac + +_LT_DECL([], [shared_archive_member_spec], [0], + [Shared archive member basename, for filename based shared library versioning on AIX])dnl +])# _LT_WITH_AIX_SONAME + +LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])]) +LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])]) + + # _LT_WITH_PIC([MODE]) # -------------------- -# implement the --with-pic flag, and support the `pic-only' and `no-pic' +# implement the --with-pic flag, and support the 'pic-only' and 'no-pic' # LT_INIT options. -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. +# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], @@ -334,19 +389,17 @@ *) pic_mode=default # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR, for lt_pkg in $withval; do - IFS="$lt_save_ifs" + IFS=$lt_save_ifs if test "X$lt_pkg" = "X$lt_p"; then pic_mode=yes fi done - IFS="$lt_save_ifs" + IFS=$lt_save_ifs ;; esac], - [pic_mode=default]) - -test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) + [pic_mode=m4_default([$1], [default])]) _LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ])# _LT_WITH_PIC @@ -359,7 +412,7 @@ [_LT_SET_OPTION([LT_INIT], [pic-only]) AC_DIAGNOSE([obsolete], [$0: Remove this warning and the call to _LT_SET_OPTION when you -put the `pic-only' option into LT_INIT's first parameter.]) +put the 'pic-only' option into LT_INIT's first parameter.]) ]) dnl aclocal-1.4 backwards compatibility: diff -Nru libsoup2.4-2.52.2/m4/ltsugar.m4 libsoup2.4-2.54.1/m4/ltsugar.m4 --- libsoup2.4-2.52.2/m4/ltsugar.m4 2015-11-09 20:25:01.000000000 +0000 +++ libsoup2.4-2.54.1/m4/ltsugar.m4 2016-04-26 12:36:08.000000000 +0000 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -Nru libsoup2.4-2.52.2/m4/ltversion.m4 libsoup2.4-2.54.1/m4/ltversion.m4 --- libsoup2.4-2.52.2/m4/ltversion.m4 2015-11-09 20:25:01.000000000 +0000 +++ libsoup2.4-2.54.1/m4/ltversion.m4 2016-04-26 12:36:08.000000000 +0000 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3337 ltversion.m4 +# serial 4179 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.2]) -m4_define([LT_PACKAGE_REVISION], [1.3337]) +m4_define([LT_PACKAGE_VERSION], [2.4.6]) +m4_define([LT_PACKAGE_REVISION], [2.4.6]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.2' -macro_revision='1.3337' +[macro_version='2.4.6' +macro_revision='2.4.6' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -Nru libsoup2.4-2.52.2/Makefile.am libsoup2.4-2.54.1/Makefile.am --- libsoup2.4-2.52.2/Makefile.am 2015-10-29 15:08:21.000000000 +0000 +++ libsoup2.4-2.54.1/Makefile.am 2016-03-13 15:24:36.000000000 +0000 @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libsoup po tests examples docs +SUBDIRS = libsoup po tests examples docs build/win32 EXTRA_DIST = \ data/effective_tld_names.dat \ @@ -12,7 +12,8 @@ glib-tap.mk \ tap-driver.sh \ tap-test \ - Makefile.glib + Makefile.glib \ + config.h.win32 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection diff -Nru libsoup2.4-2.52.2/Makefile.glib libsoup2.4-2.54.1/Makefile.glib --- libsoup2.4-2.52.2/Makefile.glib 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/Makefile.glib 2016-02-19 14:15:46.000000000 +0000 @@ -206,7 +206,8 @@ $$(GLIB_MKENUMS_H_FLAGS) \ $$($(_glib_enum_types_prefix)_MKENUMS_H_FLAGS) \ --fhead "#include \n\nG_BEGIN_DECLS\n" \ - --vhead "GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())\n" \ + --fhead "#ifndef GLIB_MKENUMS_EXTERN\n#define GLIB_MKENUMS_EXTERN\n#endif\n" \ + --vhead "GLIB_MKENUMS_EXTERN GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())\n" \ --ftail "G_END_DECLS\n\n#endif /* $(_glib_enum_types_guard) */" \ $$(filter-out Makefile, $$^) > $(1).h.tmp && \ (cmp -s $(1).h.tmp $(1).h || cp $(1).h.tmp $(1).h) && \ @@ -218,7 +219,7 @@ $(1).c.stamp: $(_glib_enum_types_h_sources) Makefile $$(_GLIB_V_GEN) $$(GLIB_MKENUMS) \ - --fhead "/* Generated by glib-mkenums. Do not edit */\n\n#include \"$(notdir $(1)).h\"\n" \ + --fhead "/* Generated by glib-mkenums. Do not edit */\n\n#ifdef HAVE_CONFIG_H\n#include \n#endif\n\n#include \"$(notdir $(1)).h\"\n\n" \ $$(GLIB_MKENUMS_C_FLAGS) \ $$($(_glib_enum_types_prefix)_MKENUMS_C_FLAGS) \ --fhead "$$(foreach f,$$(filter-out Makefile,$$(^F)),\n#include \"$$(f)\")\n\n" \ diff -Nru libsoup2.4-2.52.2/Makefile.in libsoup2.4-2.54.1/Makefile.in --- libsoup2.4-2.52.2/Makefile.in 2015-11-09 20:25:04.000000000 +0000 +++ libsoup2.4-2.54.1/Makefile.in 2016-04-26 12:36:12.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -80,19 +90,6 @@ host_triplet = @host@ @BUILD_LIBSOUP_GNOME_TRUE@am__append_1 = libsoup-gnome-2.4.pc subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in $(srcdir)/libsoup-2.4.pc.in \ - $(srcdir)/libsoup-gnome-2.4.pc.in $(srcdir)/libsoup-zip.in \ - AUTHORS COPYING NEWS README build-aux/compile \ - build-aux/config.guess build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/compile \ - $(top_srcdir)/build-aux/config.guess \ - $(top_srcdir)/build-aux/config.sub \ - $(top_srcdir)/build-aux/install-sh \ - $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \ $(top_srcdir)/m4/glibtests.m4 $(top_srcdir)/m4/gtk-doc.m4 \ @@ -103,11 +100,14 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = libsoup-2.4.pc libsoup-gnome-2.4.pc libsoup-zip +CONFIG_CLEAN_FILES = libsoup-2.4.pc libsoup-gnome-2.4.pc libsoup-zip \ + config.h.win32 CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -195,6 +195,17 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/config.h.win32.in $(srcdir)/libsoup-2.4.pc.in \ + $(srcdir)/libsoup-gnome-2.4.pc.in $(srcdir)/libsoup-zip.in \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing AUTHORS COPYING NEWS README \ + build-aux/compile build-aux/config.guess build-aux/config.sub \ + build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -262,7 +273,6 @@ CPPFLAGS = @CPPFLAGS@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -315,6 +325,9 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -324,6 +337,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -355,6 +369,7 @@ SOUP_API_VERSION = @SOUP_API_VERSION@ SOUP_CURRENT = @SOUP_CURRENT@ SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ @@ -430,7 +445,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = libsoup po tests examples docs +SUBDIRS = libsoup po tests examples docs build/win32 EXTRA_DIST = \ data/effective_tld_names.dat \ libsoup-2.4.pc.in \ @@ -440,7 +455,8 @@ glib-tap.mk \ tap-driver.sh \ tap-test \ - Makefile.glib + Makefile.glib \ + config.h.win32 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection pkgconfigdir = $(libdir)/pkgconfig @@ -464,7 +480,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -504,6 +519,8 @@ cd $(top_builddir) && $(SHELL) ./config.status $@ libsoup-zip: $(top_builddir)/config.status $(srcdir)/libsoup-zip.in cd $(top_builddir) && $(SHELL) ./config.status $@ +config.h.win32: $(top_builddir)/config.status $(srcdir)/config.h.win32.in + cd $(top_builddir) && $(SHELL) ./config.status $@ mostlyclean-libtool: -rm -f *.lo @@ -721,15 +738,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -765,17 +782,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -955,6 +972,8 @@ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-pkgconfigDATA +.PRECIOUS: Makefile + @CODE_COVERAGE_RULES@ diff -Nru libsoup2.4-2.52.2/NEWS libsoup2.4-2.54.1/NEWS --- libsoup2.4-2.52.2/NEWS 2015-11-09 20:24:33.000000000 +0000 +++ libsoup2.4-2.54.1/NEWS 2016-04-26 12:32:11.000000000 +0000 @@ -1,12 +1,85 @@ -Changes in libsoup from 2.52.1 to 2.52.2: +Changes in libsoup from 2.54.0.1 to 2.54.1: - * Fixed build under MinGW [Ignacio Casal Quintero] + * *** IMPORTANT *** + Fixed an ABI break in 2.54.0 caused by adding a member to + SoupAuthClass; 2.54.1 is ABI-compatible with 2.53.92 and + earlier, but NOT with the anomalous 2.54.0. If you built + packages against 2.54.0, you will need to rebuild them + against 2.54.1. - * Fix SoupServerWebsocketCallback handling so that the - SoupClientContext passed to it is still valid. + * Fixed NTLM authentication when ntlm_auth from the latest + version of Samba is present. [#765106, Milan Crha] - * Added a .deps file to define dependencies for valac - [Rico Tzschichholz] + * Updates to MSVC build, including for GSS-API support + [Chun-wei Fan] + + * Updated translations: + Friulian + +Changes in libsoup from 2.53.92 to 2.54.0.1: + + * (2.54.0.1 fixes a build problem with the 2.54.0 tarball, + which would not build if you configured with + "--without-gnome". There are no other changes between 2.54.0 + and 2.54.0.1.) + + * Fixed examples/simple-httpd on Windows [#758759, Chun-wei + Fan] + +Changes in libsoup from 2.53.90 to 2.53.92: + + * libsoup now supports HTTP "Negotiate"/GSSAPI/Kerberos + authentication. It must be enabled specifically by the + application and is also subject to certain other + restrictions, some of which are not yet controllable through + the API. [#587145, Guido Guenther, Tomas Popela, David + Woodhouse, Dan Winship] + + * Added support for building under MSVC [#758759, Chun-wei + Fan] + + * Fixed a problem with the 2.53.90 tarball that caused + translations to be mis-installed. + + * Updated translations: + Occitan + +Changes in libsoup from 2.53.2 to 2.53.90: + + * NUL bytes in headers are now ignored [#760832, Dan Winship] + + * Fixed transfer annotation of soup_form_decode* functions + [#743966, Lionel Landwerlin] + + * Updated translations: + Bulgarian, Latvian, Norwegian bokmål + +Changes in libsoup from 2.53.1 to 2.53.2: + + * Fixed up symbol visibility handling for mingw by copying + GLib's system [Ignacio Casal Quinteiro, #757146] + + * Finally marked the old SoupSessionAsync and SoupSessionSync + methods as deprecated [Ignacio Casal Quinteiro, Dan Winship, + #757146] + + * Added libsoup-2.4.deps for valac [Rico Tzschichholz] + + * Make it possible to build from git without gtk-doc being + installed [Ignacio Casal Quinteiro] + + * Updated translations: + Norwegian bokmål, Occitan + +Changes in libsoup from 2.52.1 to 2.53.1: + + * Really fixed build under MinGW for sure this time [Ignacio + Casal Quinteiro] + + * Fixed SoupServer Web Sockets code so that the + SoupClientContext passed to a SoupServerWebsocketCallback is + fully usable (rather than crashing when you try to do most + things). Changes in libsoup from 2.52.0 to 2.52.1: diff -Nru libsoup2.4-2.52.2/po/an.po libsoup2.4-2.54.1/po/an.po --- libsoup2.4-2.52.2/po/an.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/an.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "No se puede escuitar en l'adreza %s, puerto %d" +msgid "Could not listen on address %s, port %d: " +msgstr "No se puede escuitar en l'adreza %s, puerto %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/as.po libsoup2.4-2.54.1/po/as.po --- libsoup2.4-2.52.2/po/as.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/as.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "ঠিকনা %s, পৰ্ট %d ত শুনিব নোৱাৰি" +msgid "Could not listen on address %s, port %d: " +msgstr "ঠিকনা %s, পৰ্ট %d ত শুনিব নোৱাৰি: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/bg.po libsoup2.4-2.54.1/po/bg.po --- libsoup2.4-2.52.2/po/bg.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/bg.po 2016-04-25 17:48:49.000000000 +0000 @@ -1,40 +1,44 @@ # Bulgarian translation of libsoup po-file. -# Copyright (C) 2012, 2013 Free Software Foundation, Inc. +# Copyright (C) 2012, 2013, 2016 Free Software Foundation, Inc. # This file is distributed under the same license as the libsoup package. -# Alexander Shopov , 2012, 2013. +# Alexander Shopov , 2012, 2013, 2016. # msgid "" msgstr "" "Project-Id-Version: libsoup master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-12 06:56+0200\n" -"PO-Revision-Date: 2013-01-12 06:56+0200\n" +"POT-Creation-Date: 2016-02-01 06:26+0200\n" +"PO-Revision-Date: 2016-02-01 06:26+0200\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" -"Language: \n" +"Language: bg\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../libsoup/soup-body-input-stream.c:141 -#: ../libsoup/soup-body-input-stream.c:172 -#: ../libsoup/soup-body-input-stream.c:205 ../libsoup/soup-message-io.c:191 +#: ../libsoup/soup-body-input-stream.c:140 +#: ../libsoup/soup-body-input-stream.c:171 +#: ../libsoup/soup-body-input-stream.c:204 ../libsoup/soup-message-io.c:235 msgid "Connection terminated unexpectedly" msgstr "Връзката прекъсна неочаквано" -#: ../libsoup/soup-body-input-stream.c:461 +#: ../libsoup/soup-body-input-stream.c:462 msgid "Invalid seek request" msgstr "Неправилна заявка за търсене" -#: ../libsoup/soup-body-input-stream.c:489 +#: ../libsoup/soup-body-input-stream.c:490 msgid "Cannot truncate SoupBodyInputStream" msgstr "Потокът SoupBodyInputStream не може да бъде прекъснат" -#: ../libsoup/soup-cache-input-stream.c:77 +#: ../libsoup/soup-cache-input-stream.c:74 msgid "Network stream unexpectedly closed" msgstr "Потокът от мрежата неочаквано прекъсна" +#: ../libsoup/soup-cache-input-stream.c:291 +msgid "Failed to completely cache the resource" +msgstr "Ресурсът не може да бъде напълно кеширан" + #: ../libsoup/soup-converter-wrapper.c:192 #, c-format msgid "Output buffer is too small" @@ -48,15 +52,15 @@ msgid "Unrecognized HTTP response encoding" msgstr "Непознато кодиране на отговора от HTTP" -#: ../libsoup/soup-message-io.c:846 ../libsoup/soup-message-io.c:882 -msgid "Operation was cancelled" -msgstr "Операцията е отменена" - -#: ../libsoup/soup-message-io.c:893 +#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020 msgid "Operation would block" msgstr "Операцията ще блокира" -#: ../libsoup/soup-message-server-io.c:40 +#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005 +msgid "Operation was cancelled" +msgstr "Операцията е отменена" + +#: ../libsoup/soup-message-server-io.c:64 msgid "Could not parse HTTP request" msgstr "Заявката към HTTP не може да бъде анализирана" @@ -70,33 +74,100 @@ msgid "Invalid '%s' URI: %s" msgstr "Неправилен адрес на „%s“: %s" -#: ../libsoup/soup-session.c:4032 +#: ../libsoup/soup-server.c:1720 +msgid "Can't create a TLS server without a TLS certificate" +msgstr "Не може да се създаде сървър с TLS без съответния сертификат" + +#: ../libsoup/soup-server.c:1739 +#, c-format +msgid "Could not listen on address %s, port %d: " +msgstr "Не може да се слуша на адрес „%s“, порт %d: " + +#: ../libsoup/soup-session.c:4543 #, c-format msgid "Could not parse URI '%s'" msgstr "Адресът „%s“ е неправилен" -#: ../libsoup/soup-session.c:4069 +#: ../libsoup/soup-session.c:4580 #, c-format msgid "Unsupported URI scheme '%s'" msgstr "Схемата на адреса не се поддържа „%s“" -#: ../libsoup/soup-session.c:4091 +#: ../libsoup/soup-session.c:4602 #, c-format msgid "Not an HTTP URI" -msgstr "Не е адрес URI за HTTP" +msgstr "Не е адрес за HTTP" + +#: ../libsoup/soup-session.c:4788 +msgid "The server did not accept the WebSocket handshake." +msgstr "Сървърът не прие ръкостискането за WebSocket." + +#: ../libsoup/soup-socket.c:148 +msgid "Can't import non-socket as SoupSocket" +msgstr "Не може да се внесе като гнездо за soup нещо, което не е гнездо" + +#: ../libsoup/soup-socket.c:166 +msgid "Could not import existing socket: " +msgstr "Съществуващото гнездо не може да бъде внесено: " + +#: ../libsoup/soup-socket.c:175 +msgid "Can't import unconnected socket" +msgstr "Гнездо, което не е свързано, не може да се внесе" + +#: ../libsoup/soup-websocket.c:338 ../libsoup/soup-websocket.c:347 +msgid "WebSocket handshake expected" +msgstr "Очаква се ръкостискане за WebSocket" + +#: ../libsoup/soup-websocket.c:355 +msgid "Unsupported WebSocket version" +msgstr "Неподдържана версия на WebSocket" + +#: ../libsoup/soup-websocket.c:364 +msgid "Invalid WebSocket key" +msgstr "Неправилен ключ за WebSocket" + +#: ../libsoup/soup-websocket.c:374 +#, c-format +msgid "Incorrect WebSocket \"%s\" header" +msgstr "Неправилна заглавна част „%s“ за WebSocket" + +#: ../libsoup/soup-websocket.c:383 +msgid "Unsupported WebSocket subprotocol" +msgstr "Неподдържан подпротокол за WebSocket" + +#: ../libsoup/soup-websocket.c:510 +msgid "Server rejected WebSocket handshake" +msgstr "Сървърът отхвърли ръкостискането по WebSocket" + +#: ../libsoup/soup-websocket.c:518 ../libsoup/soup-websocket.c:527 +msgid "Server ignored WebSocket handshake" +msgstr "Сървърът пренебрегна ръкостискането по WebSocket" + +#: ../libsoup/soup-websocket.c:539 +msgid "Server requested unsupported protocol" +msgstr "Сървърът изиска неподдържан протокол" + +#: ../libsoup/soup-websocket.c:549 +msgid "Server requested unsupported extension" +msgstr "Сървърът изиска неподдържано разширение" + +#: ../libsoup/soup-websocket.c:562 +#, c-format +msgid "Server returned incorrect \"%s\" key" +msgstr "Сървърът върна неправилен ключ „%s“" -#: ../libsoup/soup-tld.c:185 +#: ../libsoup/soup-tld.c:188 msgid "Hostname is an IP address" msgstr "Името на машината е адрес по IP" -#: ../libsoup/soup-tld.c:206 +#: ../libsoup/soup-tld.c:198 ../libsoup/soup-tld.c:220 msgid "Invalid hostname" msgstr "Неправилно име на машина" -#: ../libsoup/soup-tld.c:235 +#: ../libsoup/soup-tld.c:250 msgid "Hostname has no base domain" msgstr "Името на машината не съдържа домейн" -#: ../libsoup/soup-tld.c:257 +#: ../libsoup/soup-tld.c:304 msgid "Not enough domains" msgstr "Няма достатъчно домейни" diff -Nru libsoup2.4-2.52.2/po/bn_IN.po libsoup2.4-2.54.1/po/bn_IN.po --- libsoup2.4-2.52.2/po/bn_IN.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/bn_IN.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "ঠিকানা %s, পোর্ট %d এ শোনা যায়নি" +msgid "Could not listen on address %s, port %d: " +msgstr "ঠিকানা %s, পোর্ট %d এ শোনা যায়নি: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/bs.po libsoup2.4-2.54.1/po/bs.po --- libsoup2.4-2.52.2/po/bs.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/bs.po 2016-04-25 17:48:49.000000000 +0000 @@ -77,8 +77,8 @@ #: ../libsoup/soup-server.c:1604 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Ne mogu slušati na adresi %s,%d port" +msgid "Could not listen on address %s, port %d: " +msgstr "Ne mogu slušati na adresi %s,%d port: " #: ../libsoup/soup-session.c:4485 #, c-format diff -Nru libsoup2.4-2.52.2/po/ca.po libsoup2.4-2.54.1/po/ca.po --- libsoup2.4-2.52.2/po/ca.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/ca.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "No es pot escoltar a l'adreça %s, port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "No es pot escoltar a l'adreça %s, port %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/ca@valencia.po libsoup2.4-2.54.1/po/ca@valencia.po --- libsoup2.4-2.52.2/po/ca@valencia.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/ca@valencia.po 2016-04-25 17:48:49.000000000 +0000 @@ -80,8 +80,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "No es pot escoltar a l'adreça %s, port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "No es pot escoltar a l'adreça %s, port %d: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/cs.po libsoup2.4-2.54.1/po/cs.po --- libsoup2.4-2.52.2/po/cs.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/cs.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Nelze naslouchat na adrese %s, portu %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Nelze naslouchat na adrese %s, portu %d: " #: ../libsoup/soup-session.c:4554 #, c-format @@ -110,7 +110,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "Nelze naimportovat stávající soket:" +msgstr "Nelze naimportovat stávající soket: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/da.po libsoup2.4-2.54.1/po/da.po --- libsoup2.4-2.52.2/po/da.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/da.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Kunne ikke lytte på adresse %s, port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Kunne ikke lytte på adresse %s, port %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/de.po libsoup2.4-2.54.1/po/de.po --- libsoup2.4-2.52.2/po/de.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/de.po 2016-04-25 17:48:49.000000000 +0000 @@ -85,8 +85,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Auf Adresse %s, Port %d kann nicht gehört werden" +msgid "Could not listen on address %s, port %d: " +msgstr "Auf Adresse %s, Port %d kann nicht gehört werden: " #: ../libsoup/soup-session.c:4587 #, c-format diff -Nru libsoup2.4-2.52.2/po/es.po libsoup2.4-2.54.1/po/es.po --- libsoup2.4-2.52.2/po/es.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/es.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "No se puede escuchar en la dirección %s, puerto %d" +msgid "Could not listen on address %s, port %d: " +msgstr "No se puede escuchar en la dirección %s, puerto %d: " #: ../libsoup/soup-session.c:4554 #, c-format @@ -111,7 +111,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "No se pudo importar el socket existente:" +msgstr "No se pudo importar el socket existente: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/eu.po libsoup2.4-2.54.1/po/eu.po --- libsoup2.4-2.52.2/po/eu.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/eu.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Ezin izan da '%s:%d' helbidean entzun" +msgid "Could not listen on address %s, port %d: " +msgstr "Ezin izan da '%s:%d' helbidean entzun: " #: ../libsoup/soup-session.c:4554 #, c-format @@ -111,7 +111,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "Ezin izan da dagoen socket-a inportatu:" +msgstr "Ezin izan da dagoen socket-a inportatu: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/fr.po libsoup2.4-2.54.1/po/fr.po --- libsoup2.4-2.52.2/po/fr.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/fr.po 2016-04-25 17:48:49.000000000 +0000 @@ -84,8 +84,8 @@ #: ../libsoup/soup-server.c:1736 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Impossible d'écouter l'adresse %s sur le port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Impossible d'écouter l'adresse %s sur le port %d: " #: ../libsoup/soup-session.c:4500 #, c-format diff -Nru libsoup2.4-2.52.2/po/fur.po libsoup2.4-2.54.1/po/fur.po --- libsoup2.4-2.52.2/po/fur.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/fur.po 2016-04-25 17:48:49.000000000 +0000 @@ -8,74 +8,168 @@ "Project-Id-Version: libsoup gnome-3-6\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=libsoup&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-12-10 10:22+0000\n" -"PO-Revision-Date: 2012-12-28 13:53+0100\n" -"Last-Translator: TmTFx \n" +"POT-Creation-Date: 2016-04-08 01:00+0000\n" +"PO-Revision-Date: 2016-04-08 10:06+0200\n" +"Last-Translator: Fabio Tomat \n" "Language-Team: Friulian \n" "Language: fur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.5\n" -#: ../libsoup/soup-body-input-stream.c:141 -#: ../libsoup/soup-body-input-stream.c:172 -#: ../libsoup/soup-body-input-stream.c:205 ../libsoup/soup-message-io.c:191 +#: ../libsoup/soup-body-input-stream.c:140 +#: ../libsoup/soup-body-input-stream.c:171 +#: ../libsoup/soup-body-input-stream.c:204 +#: ../libsoup/soup-message-io.c:235 msgid "Connection terminated unexpectedly" msgstr "No si spietave il termin de conession" -#: ../libsoup/soup-body-input-stream.c:461 +#: ../libsoup/soup-body-input-stream.c:462 msgid "Invalid seek request" msgstr "Domande di ricerche no valide" -#: ../libsoup/soup-body-input-stream.c:489 +#: ../libsoup/soup-body-input-stream.c:490 msgid "Cannot truncate SoupBodyInputStream" msgstr "No puès cjonçâ SoupBodyInputStream" +#: ../libsoup/soup-cache-input-stream.c:74 +msgid "Network stream unexpectedly closed" +msgstr "Flus di rêt sierât a colp" + +#: ../libsoup/soup-cache-input-stream.c:291 +msgid "Failed to completely cache the resource" +msgstr "Salvament in memorie de risorse falît" + #: ../libsoup/soup-converter-wrapper.c:192 #, c-format msgid "Output buffer is too small" msgstr "Il buffer di jessude al è masse piçul" -#: ../libsoup/soup-message-io.c:818 ../libsoup/soup-message-io.c:854 -msgid "Operation was cancelled" -msgstr "L'operazion a je stade scancelade" +#: ../libsoup/soup-message-client-io.c:41 +msgid "Could not parse HTTP response" +msgstr "Impussibil analizâ la rispueste HTTP" + +#: ../libsoup/soup-message-client-io.c:66 +msgid "Unrecognized HTTP response encoding" +msgstr "Codifiche rispueste HTTP no cognossude" -#: ../libsoup/soup-message-io.c:865 +#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020 msgid "Operation would block" -msgstr "L'operazion a sarà blocade" +msgstr "L'operazion e sarà blocade" + +#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005 +msgid "Operation was cancelled" +msgstr "L'operazion e je stade scancelade" -#: ../libsoup/soup-request.c:142 +#: ../libsoup/soup-message-server-io.c:64 +msgid "Could not parse HTTP request" +msgstr "Impussibil analizâ la richieste HTTP" + +#: ../libsoup/soup-request.c:140 #, c-format msgid "No URI provided" msgstr "No'l è stât furnît un URI" -#: ../libsoup/soup-request.c:152 +#: ../libsoup/soup-request.c:150 #, c-format msgid "Invalid '%s' URI: %s" msgstr "URI '%s' no valit: %s" -#: ../libsoup/soup-requester.c:219 +#: ../libsoup/soup-server.c:1720 +msgid "Can't create a TLS server without a TLS certificate" +msgstr "Impussibil creâ un servidôr TLS cence un certificât TLS" + +#: ../libsoup/soup-server.c:1739 +#, c-format +msgid "Could not listen on address %s, port %d: " +msgstr "Impussibil scoltâ te direzion %s, puarte %d: " + +#: ../libsoup/soup-session.c:4543 #, c-format msgid "Could not parse URI '%s'" msgstr "No puès analizâ l'URI '%s'" -#: ../libsoup/soup-requester.c:253 +#: ../libsoup/soup-session.c:4580 #, c-format msgid "Unsupported URI scheme '%s'" msgstr "Scheme URI '%s' no supuartât" -#: ../libsoup/soup-tld.c:154 +#: ../libsoup/soup-session.c:4602 +#, c-format +msgid "Not an HTTP URI" +msgstr "No un URI HTTP" + +#: ../libsoup/soup-session.c:4788 +msgid "The server did not accept the WebSocket handshake." +msgstr "Il servidôr nol acete il handshake WebSocket" + +#: ../libsoup/soup-socket.c:148 +msgid "Can't import non-socket as SoupSocket" +msgstr "Impussibil impuartâ non-socket come SoupSocket" + +#: ../libsoup/soup-socket.c:166 +msgid "Could not import existing socket: " +msgstr "Impussibil impuartâ socket esistent: " + +#: ../libsoup/soup-socket.c:175 +msgid "Can't import unconnected socket" +msgstr "Impussibil impuartâ socket no conetût" + +#: ../libsoup/soup-websocket.c:338 ../libsoup/soup-websocket.c:347 +msgid "WebSocket handshake expected" +msgstr "Si spietave handshake WebSocket" + +#: ../libsoup/soup-websocket.c:355 +msgid "Unsupported WebSocket version" +msgstr "Version WebSocket no supuartade" + +#: ../libsoup/soup-websocket.c:364 +msgid "Invalid WebSocket key" +msgstr "Clâf WebSocket no valide" + +#: ../libsoup/soup-websocket.c:374 +#, c-format +msgid "Incorrect WebSocket \"%s\" header" +msgstr "Intestazion WebSocket \"%s\" no valide" + +#: ../libsoup/soup-websocket.c:383 +msgid "Unsupported WebSocket subprotocol" +msgstr "Sot-protocol WebSocket no supuartât" + +#: ../libsoup/soup-websocket.c:510 +msgid "Server rejected WebSocket handshake" +msgstr "Il servidôr al à refudât l'handshake WebSocket" + +#: ../libsoup/soup-websocket.c:518 ../libsoup/soup-websocket.c:527 +msgid "Server ignored WebSocket handshake" +msgstr "Il servidôr al à ignorât l'handshake WebSocket" + +#: ../libsoup/soup-websocket.c:539 +msgid "Server requested unsupported protocol" +msgstr "Il servidôr al à domandât un protocol no supuartât" + +#: ../libsoup/soup-websocket.c:549 +msgid "Server requested unsupported extension" +msgstr "Il servidôr al à domandât une estension no supuartade" + +#: ../libsoup/soup-websocket.c:562 +#, c-format +msgid "Server returned incorrect \"%s\" key" +msgstr "Il servidôr al à tornât la clâf \"%s\" sbaliade" + +#: ../libsoup/soup-tld.c:188 msgid "Hostname is an IP address" msgstr "Il non host al è un indiriz IP" -#: ../libsoup/soup-tld.c:175 +#: ../libsoup/soup-tld.c:198 ../libsoup/soup-tld.c:220 msgid "Invalid hostname" -msgstr "Il non host a no'l è valit" +msgstr "Il non host nol è valit" -#: ../libsoup/soup-tld.c:204 +#: ../libsoup/soup-tld.c:250 msgid "Hostname has no base domain" -msgstr "Il non host a no'l a un domini di base" +msgstr "Il non host nol à un domini di base" -#: ../libsoup/soup-tld.c:226 +#: ../libsoup/soup-tld.c:304 msgid "Not enough domains" msgstr "No vonde dominis" diff -Nru libsoup2.4-2.52.2/po/gl.po libsoup2.4-2.54.1/po/gl.po --- libsoup2.4-2.52.2/po/gl.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/gl.po 2016-04-25 17:48:49.000000000 +0000 @@ -81,8 +81,8 @@ #: ../libsoup/soup-server.c:1736 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Non é posíbel escoitar no enderezo %s, porto %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Non é posíbel escoitar no enderezo %s, porto %d: " #: ../libsoup/soup-session.c:4500 #, c-format @@ -109,7 +109,7 @@ #: ../libsoup/soup-socket.c:168 msgid "Could not import existing socket: " -msgstr "Non é posíbel importar un socket existente:" +msgstr "Non é posíbel importar un socket existente: " #: ../libsoup/soup-socket.c:177 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/gu.po libsoup2.4-2.54.1/po/gu.po --- libsoup2.4-2.52.2/po/gu.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/gu.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "સરનામાં %s પર સાંભળી શક્યા નહિં, પોર્ટ %d" +msgid "Could not listen on address %s, port %d: " +msgstr "સરનામાં %s પર સાંભળી શક્યા નહિં, પોર્ટ %d: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/he.po libsoup2.4-2.54.1/po/he.po --- libsoup2.4-2.52.2/po/he.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/he.po 2016-04-25 17:48:49.000000000 +0000 @@ -85,8 +85,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "לא ניתן להאזין לכתובת %s, פתחה %d" +msgid "Could not listen on address %s, port %d: " +msgstr "לא ניתן להאזין לכתובת %s, פתחה %d:" #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/hi.po libsoup2.4-2.54.1/po/hi.po --- libsoup2.4-2.52.2/po/hi.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/hi.po 2016-04-25 17:48:49.000000000 +0000 @@ -85,8 +85,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "पता %s, पोर्ट %d पर सुन नहीं सकता है" +msgid "Could not listen on address %s, port %d: " +msgstr "पता %s, पोर्ट %d पर सुन नहीं सकता है: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/hu.po libsoup2.4-2.54.1/po/hu.po --- libsoup2.4-2.52.2/po/hu.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/hu.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1736 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Nem sikerült figyelni a(z) %s címen a(z) %d. porton" +msgid "Could not listen on address %s, port %d: " +msgstr "Nem sikerült figyelni a(z) %s címen a(z) %d. porton: " #: ../libsoup/soup-session.c:4500 #, c-format diff -Nru libsoup2.4-2.52.2/po/id.po libsoup2.4-2.54.1/po/id.po --- libsoup2.4-2.52.2/po/id.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/id.po 2016-04-25 17:48:49.000000000 +0000 @@ -84,8 +84,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Tak bisa mendengar pada alamat %s, port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Tak bisa mendengar pada alamat %s, port %d: " #: ../libsoup/soup-session.c:4554 #, c-format @@ -112,7 +112,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "Tak dapat mengimpor soket yang telah ada:" +msgstr "Tak dapat mengimpor soket yang telah ada: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/it.po libsoup2.4-2.54.1/po/it.po --- libsoup2.4-2.52.2/po/it.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/it.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Impossibile restare in ascolto sull'indirizzo %s, porta %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Impossibile restare in ascolto sull'indirizzo %s, porta %d: " #: ../libsoup/soup-session.c:4554 #, c-format @@ -110,7 +110,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "Impossibile importare il socket esistente:" +msgstr "Impossibile importare il socket esistente: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/kn.po libsoup2.4-2.54.1/po/kn.po --- libsoup2.4-2.52.2/po/kn.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/kn.po 2016-04-25 17:48:49.000000000 +0000 @@ -81,8 +81,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "%s ವಿಳಾಸದಲ್ಲಿ, %d ಸಂಪರ್ಕಸ್ಥಾನದಲ್ಲಿ ಆಲಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ" +msgid "Could not listen on address %s, port %d: " +msgstr "%s ವಿಳಾಸದಲ್ಲಿ, %d ಸಂಪರ್ಕಸ್ಥಾನದಲ್ಲಿ ಆಲಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:" #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/ko.po libsoup2.4-2.54.1/po/ko.po --- libsoup2.4-2.52.2/po/ko.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/ko.po 2016-04-25 17:48:49.000000000 +0000 @@ -84,8 +84,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "주소 %s, 포트 %d번에 연결을 받을 수 없습니다" +msgid "Could not listen on address %s, port %d: " +msgstr "주소 %s, 포트 %d번에 연결을 받을 수 없습니다: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/lt.po libsoup2.4-2.54.1/po/lt.po --- libsoup2.4-2.52.2/po/lt.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/lt.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Nepavyksta klausytis adreso %s, prievadu %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Nepavyksta klausytis adreso %s, prievadu %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/lv.po libsoup2.4-2.54.1/po/lv.po --- libsoup2.4-2.52.2/po/lv.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/lv.po 2016-04-25 17:48:49.000000000 +0000 @@ -3,14 +3,14 @@ # This file is distributed under the same license as the libsoup package. # # Tranzistors , 2012. -# Rūdolfs Mazurs , 2012, 2013, 2014. +# Rūdolfs Mazurs , 2012, 2013, 2014, 2016. msgid "" msgstr "" "Project-Id-Version: libsoup master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=libsoup&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2014-10-06 21:59+0000\n" -"PO-Revision-Date: 2014-10-07 21:08+0300\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup&" +"keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-02-08 13:23+0000\n" +"PO-Revision-Date: 2016-02-11 23:21+0200\n" "Last-Translator: Rūdolfs Mazurs \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -19,11 +19,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" #: ../libsoup/soup-body-input-stream.c:140 #: ../libsoup/soup-body-input-stream.c:171 -#: ../libsoup/soup-body-input-stream.c:204 ../libsoup/soup-message-io.c:196 +#: ../libsoup/soup-body-input-stream.c:204 ../libsoup/soup-message-io.c:235 msgid "Connection terminated unexpectedly" msgstr "Savienojums tika negaidīti pārtraukts" @@ -35,11 +35,11 @@ msgid "Cannot truncate SoupBodyInputStream" msgstr "Nevar apraut SoupBodyInputStream" -#: ../libsoup/soup-cache-input-stream.c:73 +#: ../libsoup/soup-cache-input-stream.c:74 msgid "Network stream unexpectedly closed" msgstr "Tīkla straume negaidīti aizvērās" -#: ../libsoup/soup-cache-input-stream.c:290 +#: ../libsoup/soup-cache-input-stream.c:291 msgid "Failed to completely cache the resource" msgstr "Neizdevās resursu pilnībā noglabāt kešatmiņā" @@ -56,15 +56,15 @@ msgid "Unrecognized HTTP response encoding" msgstr "Neatpazīts HTTP atbildes kodējums" -#: ../libsoup/soup-message-io.c:854 ../libsoup/soup-message-io.c:890 -msgid "Operation was cancelled" -msgstr "Darbība tika atcelta" - -#: ../libsoup/soup-message-io.c:901 +#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020 msgid "Operation would block" msgstr "Darbība bloķētu" -#: ../libsoup/soup-message-server-io.c:41 +#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005 +msgid "Operation was cancelled" +msgstr "Darbība tika atcelta" + +#: ../libsoup/soup-message-server-io.c:64 msgid "Could not parse HTTP request" msgstr "Nevarēja parsēt HTTP pieprasījumu" @@ -78,42 +78,88 @@ msgid "Invalid '%s' URI: %s" msgstr "Nederīgs “%s” URI — %s" -#: ../libsoup/soup-server.c:1528 +#: ../libsoup/soup-server.c:1720 msgid "Can't create a TLS server without a TLS certificate" msgstr "Bez TLS sertifikāta nevar izveidot TLS serveri" -#: ../libsoup/soup-server.c:1547 +#: ../libsoup/soup-server.c:1739 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Nevarēja sākt klausīties adresi %s, portu %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Nevarēja sākt klausīties adresi %s, portu %d: " -#: ../libsoup/soup-session.c:4466 +#: ../libsoup/soup-session.c:4543 #, c-format msgid "Could not parse URI '%s'" msgstr "Nevarēja parsēt URI “%s”" -#: ../libsoup/soup-session.c:4503 +#: ../libsoup/soup-session.c:4580 #, c-format msgid "Unsupported URI scheme '%s'" msgstr "Neatbalstīta URI shēma “%s”" -#: ../libsoup/soup-session.c:4525 +#: ../libsoup/soup-session.c:4602 #, c-format msgid "Not an HTTP URI" msgstr "Nav HTTP URI" -#: ../libsoup/soup-socket.c:142 +#: ../libsoup/soup-session.c:4788 +msgid "The server did not accept the WebSocket handshake." +msgstr "Serveris nepieņēma WebSocket rokasspiedienu." + +#: ../libsoup/soup-socket.c:148 msgid "Can't import non-socket as SoupSocket" msgstr "Nevar importēt ne-ligzdu kā SoupSocket" -#: ../libsoup/soup-socket.c:160 +#: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " msgstr "Nevarēja importēt esošu ligzdu: " -#: ../libsoup/soup-socket.c:169 +#: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" msgstr "Nevar importēt nesavienotu ligzdu" +#: ../libsoup/soup-websocket.c:338 ../libsoup/soup-websocket.c:347 +msgid "WebSocket handshake expected" +msgstr "WebSocket rokasspiedienam beidzās termiņš" + +#: ../libsoup/soup-websocket.c:355 +msgid "Unsupported WebSocket version" +msgstr "Neatbalstīta WebSocket versija" + +#: ../libsoup/soup-websocket.c:364 +msgid "Invalid WebSocket key" +msgstr "Nederīga WebSocket atslēga" + +#: ../libsoup/soup-websocket.c:374 +#, c-format +msgid "Incorrect WebSocket \"%s\" header" +msgstr "Nederīga WebSocket “%s” galvene" + +#: ../libsoup/soup-websocket.c:383 +msgid "Unsupported WebSocket subprotocol" +msgstr "Neatbalstīts WebSocket apakšprotokols" + +#: ../libsoup/soup-websocket.c:510 +msgid "Server rejected WebSocket handshake" +msgstr "Serveris noraidīja WebSocket rokasspiedienu" + +#: ../libsoup/soup-websocket.c:518 ../libsoup/soup-websocket.c:527 +msgid "Server ignored WebSocket handshake" +msgstr "Serveris ignorēja WebSocket rokasspiedienu" + +#: ../libsoup/soup-websocket.c:539 +msgid "Server requested unsupported protocol" +msgstr "Serveris pieprasīja neatbalstītu protokolu" + +#: ../libsoup/soup-websocket.c:549 +msgid "Server requested unsupported extension" +msgstr "Serveris pieprasīja neatbalstītu paplašinājumu" + +#: ../libsoup/soup-websocket.c:562 +#, c-format +msgid "Server returned incorrect \"%s\" key" +msgstr "Serveris atgrieza nederīgu “%s” atslēgu" + #: ../libsoup/soup-tld.c:188 msgid "Hostname is an IP address" msgstr "Datora nosaukums ir IP adrese" @@ -130,4 +176,3 @@ msgid "Not enough domains" msgstr "Nepietiekami daudz domēnu" - diff -Nru libsoup2.4-2.52.2/po/Makefile.in.in libsoup2.4-2.54.1/po/Makefile.in.in --- libsoup2.4-2.52.2/po/Makefile.in.in 2015-07-09 13:50:37.000000000 +0000 +++ libsoup2.4-2.54.1/po/Makefile.in.in 2015-03-09 01:39:54.000000000 +0000 @@ -33,8 +33,7 @@ datadir = @datadir@ datarootdir = @datarootdir@ libdir = @libdir@ -DATADIRNAME = @DATADIRNAME@ -itlocaledir = $(prefix)/$(DATADIRNAME)/locale +localedir = @localedir@ subdir = po install_sh = @install_sh@ # Automake >= 1.8 provides @mkdir_p@. @@ -80,7 +79,7 @@ .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $* $(GETTEXT_PACKAGE).pot -o $*.pox .po.mo: $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $< @@ -108,7 +107,7 @@ install-data-yes: all linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + dir=$(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \ $(mkdir_p) $$dir; \ if test -r $$lang.gmo; then \ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ @@ -142,8 +141,8 @@ uninstall: linguas="$(USE_LINGUAS)"; \ for lang in $$linguas; do \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ - rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ done check: all $(GETTEXT_PACKAGE).pot diff -Nru libsoup2.4-2.52.2/po/mr.po libsoup2.4-2.54.1/po/mr.po --- libsoup2.4-2.52.2/po/mr.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/mr.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "पत्ता %s, पोर्ट %d वर ऐकणे अशक्य" +msgid "Could not listen on address %s, port %d: " +msgstr "पत्ता %s, पोर्ट %d वर ऐकणे अशक्य: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/nb.po libsoup2.4-2.54.1/po/nb.po --- libsoup2.4-2.52.2/po/nb.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/nb.po 2016-04-25 17:48:49.000000000 +0000 @@ -1,14 +1,14 @@ # Norwegian bokmål translation of libsoup. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Kjartan Maraas , 2012-2015. +# Kjartan Maraas , 2012-2016. # msgid "" msgstr "" -"Project-Id-Version: libsoup 3.17.x\n" +"Project-Id-Version: libsoup 3.19.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-11 19:28+0200\n" -"PO-Revision-Date: 2015-08-11 19:29+0200\n" +"POT-Creation-Date: 2016-01-10 20:09+0100\n" +"PO-Revision-Date: 2016-01-10 20:09+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian bokmål \n" "Language: \n" @@ -73,31 +73,31 @@ msgid "Invalid '%s' URI: %s" msgstr "Ugyldig «%s» URI: %s" -#: ../libsoup/soup-server.c:1711 +#: ../libsoup/soup-server.c:1720 msgid "Can't create a TLS server without a TLS certificate" msgstr "Kan ikke lage en TLS-tjener uten et TLS-sertifikat" -#: ../libsoup/soup-server.c:1730 +#: ../libsoup/soup-server.c:1739 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Kunne ikke lytte på adresse %s, port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Kunne ikke lytte på adresse %s, port %d: " -#: ../libsoup/soup-session.c:4587 +#: ../libsoup/soup-session.c:4543 #, c-format msgid "Could not parse URI '%s'" msgstr "Kunne ikke tolke URI «%s»" -#: ../libsoup/soup-session.c:4624 +#: ../libsoup/soup-session.c:4580 #, c-format msgid "Unsupported URI scheme '%s'" msgstr "URI-skjema «%s» er ikke støttet" -#: ../libsoup/soup-session.c:4646 +#: ../libsoup/soup-session.c:4602 #, c-format msgid "Not an HTTP URI" msgstr "Ikke en HTTP URI" -#: ../libsoup/soup-session.c:4830 +#: ../libsoup/soup-session.c:4788 msgid "The server did not accept the WebSocket handshake." msgstr "Tjeneren godtok ikke WebSocket-håndtrykk." diff -Nru libsoup2.4-2.52.2/po/oc.po libsoup2.4-2.54.1/po/oc.po --- libsoup2.4-2.52.2/po/oc.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/oc.po 2016-04-25 17:48:49.000000000 +0000 @@ -1,17 +1,15 @@ # Occitan translation for libsoup. # Copyright (C) 2012-2015 libsoup's COPYRIGHT HOLDER # This file is distributed under the same license as the libsoup package. -# -# -# Cédric Valmary (Tot en Òc) , 2015. +# Cédric Valmary , 2015. # Cédric Valmary (Tot en òc) , 2015. msgid "" msgstr "" "Project-Id-Version: libsoup master\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libsoup" -"&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-05-27 10:37+0000\n" -"PO-Revision-Date: 2015-05-27 18:51+0200\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" +"product=libsoup&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-02-18 13:26+0000\n" +"PO-Revision-Date: 2015-10-31 08:12+0200\n" "Last-Translator: Cédric Valmary (Tot en òc) \n" "Language-Team: Tot en òc (totenoc.eu)\n" "Language: oc\n" @@ -22,157 +20,157 @@ "X-Generator: Virtaal 0.7.1\n" "X-Project-Style: gnome\n" -#: ../libsoup/soup-body-input-stream.c:140 -#: ../libsoup/soup-body-input-stream.c:171 -#: ../libsoup/soup-body-input-stream.c:204 ../libsoup/soup-message-io.c:235 +#: ../libsoup/soup-body-input-stream.c:140 +#: ../libsoup/soup-body-input-stream.c:171 +#: ../libsoup/soup-body-input-stream.c:204 ../libsoup/soup-message-io.c:235 msgid "Connection terminated unexpectedly" -msgstr "La connexion es estada interrompuda d'un biais inesperat" +msgstr "La connexion es estada interrompuda d'un biais imprevist" -#: ../libsoup/soup-body-input-stream.c:462 +#: ../libsoup/soup-body-input-stream.c:462 msgid "Invalid seek request" msgstr "Requèsta de recèrca invalida" -#: ../libsoup/soup-body-input-stream.c:490 +#: ../libsoup/soup-body-input-stream.c:490 msgid "Cannot truncate SoupBodyInputStream" msgstr "Impossible de trocejar lo SoupBodyInputStream" -#: ../libsoup/soup-cache-input-stream.c:74 +#: ../libsoup/soup-cache-input-stream.c:74 msgid "Network stream unexpectedly closed" msgstr "Lo flux ret s'es arrestat inopinèament" -#: ../libsoup/soup-cache-input-stream.c:291 +#: ../libsoup/soup-cache-input-stream.c:291 msgid "Failed to completely cache the resource" -msgstr "Impossible de metre la ressorsa totalament en escondedor" +msgstr "Impossible de metre la ressorsa totalament en cache" -#: ../libsoup/soup-converter-wrapper.c:192 -#, c-format +#: ../libsoup/soup-converter-wrapper.c:192 +#, c-format msgid "Output buffer is too small" msgstr "La memòria tampon de sortida es tròp pichona" -#: ../libsoup/soup-message-client-io.c:41 +#: ../libsoup/soup-message-client-io.c:41 msgid "Could not parse HTTP response" msgstr "Impossible d'analisar la responsa HTTP" -#: ../libsoup/soup-message-client-io.c:66 +#: ../libsoup/soup-message-client-io.c:66 msgid "Unrecognized HTTP response encoding" msgstr "Encodatge de responsa HTTP desconegut" -#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020 +#: ../libsoup/soup-message-io.c:392 ../libsoup/soup-message-io.c:1020 msgid "Operation would block" msgstr "L'operacion auriá blocat" -#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005 +#: ../libsoup/soup-message-io.c:972 ../libsoup/soup-message-io.c:1005 msgid "Operation was cancelled" msgstr "L'operacion es estada anullada" -#: ../libsoup/soup-message-server-io.c:64 +#: ../libsoup/soup-message-server-io.c:64 msgid "Could not parse HTTP request" msgstr "Impossible d'analisar la requèsta HTTP" -#: ../libsoup/soup-request.c:140 -#, c-format +#: ../libsoup/soup-request.c:140 +#, c-format msgid "No URI provided" msgstr "Cap d'URI pas provesit" -#: ../libsoup/soup-request.c:150 -#, c-format +#: ../libsoup/soup-request.c:150 +#, c-format msgid "Invalid '%s' URI: %s" msgstr "URI « %s » invalid : %s" -#: ../libsoup/soup-server.c:1711 +#: ../libsoup/soup-server.c:1720 msgid "Can't create a TLS server without a TLS certificate" msgstr "Impossible de crear un servidor TLS sens un certificat TLS" -#: ../libsoup/soup-server.c:1730 -#, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Impossible d'escotar l'adreça %s sul pòrt %d" +#: ../libsoup/soup-server.c:1739 +#, c-format +msgid "Could not listen on address %s, port %d: " +msgstr "Impossible d'escotar l'adreça %s sul pòrt %d: " -#: ../libsoup/soup-session.c:4554 -#, c-format +#: ../libsoup/soup-session.c:4543 +#, c-format msgid "Could not parse URI '%s'" msgstr "Impossible d'analisar l'URI « %s »" -#: ../libsoup/soup-session.c:4591 -#, c-format +#: ../libsoup/soup-session.c:4580 +#, c-format msgid "Unsupported URI scheme '%s'" msgstr "L'esquèma d'URI « %s » es pas pres en carga" -#: ../libsoup/soup-session.c:4613 -#, c-format +#: ../libsoup/soup-session.c:4602 +#, c-format msgid "Not an HTTP URI" msgstr "Es pas un URI HTTP" -#: ../libsoup/soup-session.c:4797 +#: ../libsoup/soup-session.c:4788 msgid "The server did not accept the WebSocket handshake." msgstr "Lo servidor a pas acceptat la negociacion WebSocket." -#: ../libsoup/soup-socket.c:148 +#: ../libsoup/soup-socket.c:148 msgid "Can't import non-socket as SoupSocket" msgstr "Impossible d'importar de contengut non-socket coma SoupSocket" -#: ../libsoup/soup-socket.c:166 +#: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " msgstr "Impossible d'importar lo connectador ret existent : " -#: ../libsoup/soup-socket.c:175 +#: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" msgstr "Impossible d'importar lo connectador ret non connectat" -#: ../libsoup/soup-websocket.c:336 ../libsoup/soup-websocket.c:345 +#: ../libsoup/soup-websocket.c:338 ../libsoup/soup-websocket.c:347 msgid "WebSocket handshake expected" msgstr "Negociacion WebSocket esperada" -#: ../libsoup/soup-websocket.c:353 +#: ../libsoup/soup-websocket.c:355 msgid "Unsupported WebSocket version" msgstr "Version de WebSocket pas presa en carga" -#: ../libsoup/soup-websocket.c:362 +#: ../libsoup/soup-websocket.c:364 msgid "Invalid WebSocket key" msgstr "Clau WebSocket pas valabla" -#: ../libsoup/soup-websocket.c:372 -#, c-format +#: ../libsoup/soup-websocket.c:374 +#, c-format msgid "Incorrect WebSocket \"%s\" header" msgstr "Entèsta WebSocket « %s » incorrècta" -#: ../libsoup/soup-websocket.c:381 +#: ../libsoup/soup-websocket.c:383 msgid "Unsupported WebSocket subprotocol" msgstr "Sosprotocòl de WebSocket pas pres en carga" -#: ../libsoup/soup-websocket.c:508 +#: ../libsoup/soup-websocket.c:510 msgid "Server rejected WebSocket handshake" msgstr "Lo servidor a regetat la negociacion WebSocket" -#: ../libsoup/soup-websocket.c:516 ../libsoup/soup-websocket.c:525 +#: ../libsoup/soup-websocket.c:518 ../libsoup/soup-websocket.c:527 msgid "Server ignored WebSocket handshake" msgstr "Lo servidor a ignorat la negociacion WebSocket" -#: ../libsoup/soup-websocket.c:537 +#: ../libsoup/soup-websocket.c:539 msgid "Server requested unsupported protocol" msgstr "Lo servidor a demandat un protocòl pas pres en carga" -#: ../libsoup/soup-websocket.c:547 +#: ../libsoup/soup-websocket.c:549 msgid "Server requested unsupported extension" msgstr "Lo servidor a demandat una extension pas presa en carga" -#: ../libsoup/soup-websocket.c:560 -#, c-format +#: ../libsoup/soup-websocket.c:562 +#, c-format msgid "Server returned incorrect \"%s\" key" msgstr "Lo servidor a renviat una clau « %s » incorrècta" -#: ../libsoup/soup-tld.c:188 +#: ../libsoup/soup-tld.c:188 msgid "Hostname is an IP address" msgstr "Lo nom d'òste es una adreça IP" -#: ../libsoup/soup-tld.c:198 ../libsoup/soup-tld.c:220 +#: ../libsoup/soup-tld.c:198 ../libsoup/soup-tld.c:220 msgid "Invalid hostname" msgstr "Nom d'òste invalid" -#: ../libsoup/soup-tld.c:250 +#: ../libsoup/soup-tld.c:250 msgid "Hostname has no base domain" msgstr "Lo nom d'òste a pas de domeni de basa" -#: ../libsoup/soup-tld.c:304 +#: ../libsoup/soup-tld.c:304 msgid "Not enough domains" msgstr "Pas pro de domenis" diff -Nru libsoup2.4-2.52.2/po/or.po libsoup2.4-2.54.1/po/or.po --- libsoup2.4-2.52.2/po/or.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/or.po 2016-04-25 17:48:49.000000000 +0000 @@ -81,8 +81,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "ଠିକଣା %s, ପୋର୍ଟ %d ରେ ଶୁଣିପାରିବେ ନାହିଁ" +msgid "Could not listen on address %s, port %d: " +msgstr "ଠିକଣା %s, ପୋର୍ଟ %d ରେ ଶୁଣିପାରିବେ ନାହିଁ: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/pa.po libsoup2.4-2.54.1/po/pa.po --- libsoup2.4-2.52.2/po/pa.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/pa.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "ਸਿਰਨਾਵਾਂ %s, ਪੋਰਟ %d ਉੱਤੇ ਸੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" +msgid "Could not listen on address %s, port %d: " +msgstr "ਸਿਰਨਾਵਾਂ %s, ਪੋਰਟ %d ਉੱਤੇ ਸੁਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: " #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/pl.po libsoup2.4-2.54.1/po/pl.po --- libsoup2.4-2.52.2/po/pl.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/pl.po 2016-04-25 17:48:49.000000000 +0000 @@ -86,8 +86,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Nie można nasłuchiwać na adresie %s, porcie %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Nie można nasłuchiwać na adresie %s, porcie %d: " #: ../libsoup/soup-session.c:4587 #, c-format diff -Nru libsoup2.4-2.52.2/po/pt_BR.po libsoup2.4-2.54.1/po/pt_BR.po --- libsoup2.4-2.52.2/po/pt_BR.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/pt_BR.po 2016-04-25 17:48:49.000000000 +0000 @@ -84,8 +84,8 @@ #: ../libsoup/soup-server.c:1736 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Não foi possível escutar o endereço %s, porta %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Não foi possível escutar o endereço %s, porta %d: " #: ../libsoup/soup-session.c:4500 #, c-format diff -Nru libsoup2.4-2.52.2/po/pt.po libsoup2.4-2.54.1/po/pt.po --- libsoup2.4-2.52.2/po/pt.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/pt.po 2016-04-25 17:48:49.000000000 +0000 @@ -84,8 +84,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Impossível ouvir no endereço %s, porta %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Impossível ouvir no endereço %s, porta %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/ru.po libsoup2.4-2.54.1/po/ru.po --- libsoup2.4-2.52.2/po/ru.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/ru.po 2016-04-25 17:48:49.000000000 +0000 @@ -85,8 +85,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Не удалось начать прослушивание по адресу %s (порт — %d)" +msgid "Could not listen on address %s, port %d: " +msgstr "Не удалось начать прослушивание по адресу %s (порт — %d): " #: ../libsoup/soup-session.c:4554 #, c-format @@ -114,7 +114,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "Не удалось импортировать существующий сокет:" +msgstr "Не удалось импортировать существующий сокет: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/sk.po libsoup2.4-2.54.1/po/sk.po --- libsoup2.4-2.52.2/po/sk.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/sk.po 2016-04-25 17:48:49.000000000 +0000 @@ -88,8 +88,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Nepodarilo sa počúvať na adrese %s, porte %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Nepodarilo sa počúvať na adrese %s, porte %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/sl.po libsoup2.4-2.54.1/po/sl.po --- libsoup2.4-2.52.2/po/sl.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/sl.po 2016-04-25 17:48:49.000000000 +0000 @@ -85,8 +85,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Ni mogoče prisluhniti naslovu %s, vrata %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Ni mogoče prisluhniti naslovu %s, vrata %d: " #: ../libsoup/soup-session.c:4554 #, c-format @@ -113,7 +113,7 @@ #: ../libsoup/soup-socket.c:166 msgid "Could not import existing socket: " -msgstr "Ni mogoče uvoziti obstoječega vtiča:" +msgstr "Ni mogoče uvoziti obstoječega vtiča: " #: ../libsoup/soup-socket.c:175 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/sr@latin.po libsoup2.4-2.54.1/po/sr@latin.po --- libsoup2.4-2.52.2/po/sr@latin.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/sr@latin.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Ne mogu da osluškujem na adresi „%s“, priključnik %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Ne mogu da osluškujem na adresi „%s“, priključnik %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/sr.po libsoup2.4-2.54.1/po/sr.po --- libsoup2.4-2.52.2/po/sr.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/sr.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Не могу да ослушкујем на адреси „%s“, прикључник %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Не могу да ослушкујем на адреси „%s“, прикључник %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/sv.po libsoup2.4-2.54.1/po/sv.po --- libsoup2.4-2.52.2/po/sv.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/sv.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Kan inte lyssna på adress %s, port %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Kan inte lyssna på adress %s, port %d: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/te.po libsoup2.4-2.54.1/po/te.po --- libsoup2.4-2.52.2/po/te.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/te.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "చిరునామా %s పైన వినలేదు, పోర్ట్ %d" +msgid "Could not listen on address %s, port %d: " +msgstr "చిరునామా %s పైన వినలేదు, పోర్ట్ %d: " #: ../libsoup/soup-session.c:4466 #, c-format @@ -107,7 +107,7 @@ #: ../libsoup/soup-socket.c:160 msgid "Could not import existing socket: " -msgstr "ఉన్న సాకెట్‌ను దిగుమతిచేయలేదు:" +msgstr "ఉన్న సాకెట్‌ను దిగుమతిచేయలేదు: " #: ../libsoup/soup-socket.c:169 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/th.po libsoup2.4-2.54.1/po/th.po --- libsoup2.4-2.52.2/po/th.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/th.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "ไม่สามารถรอรับการเชื่อมต่อที่ที่อยู่ %s, พอร์ต %d ได้" +msgid "Could not listen on address %s, port %d: " +msgstr "ไม่สามารถรอรับการเชื่อมต่อที่ที่อยู่ %s, พอร์ต %d ได้: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/tr.po libsoup2.4-2.54.1/po/tr.po --- libsoup2.4-2.52.2/po/tr.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/tr.po 2016-04-25 17:48:49.000000000 +0000 @@ -87,8 +87,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "%s adresinin %d bağlantı noktası dinlenemedi" +msgid "Could not listen on address %s, port %d: " +msgstr "%s adresinin %d bağlantı noktası dinlenemedi: " #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/po/uk.po libsoup2.4-2.54.1/po/uk.po --- libsoup2.4-2.52.2/po/uk.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/uk.po 2016-04-25 17:48:49.000000000 +0000 @@ -83,8 +83,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Не вдалося почати прослуховування за адресою %s (порт — %d)" +msgid "Could not listen on address %s, port %d: " +msgstr "Не вдалося почати прослуховування за адресою %s (порт — %d): " #: ../libsoup/soup-session.c:4424 #, c-format @@ -107,7 +107,7 @@ #: ../libsoup/soup-socket.c:159 msgid "Could not import existing socket: " -msgstr "Не вдалося імпортувати наявний сокет:" +msgstr "Не вдалося імпортувати наявний сокет: " #: ../libsoup/soup-socket.c:168 msgid "Can't import unconnected socket" diff -Nru libsoup2.4-2.52.2/po/vi.po libsoup2.4-2.54.1/po/vi.po --- libsoup2.4-2.52.2/po/vi.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/vi.po 2016-04-25 17:48:49.000000000 +0000 @@ -84,8 +84,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "Không thể lắng nghe trên địa chỉ %s, cổng %d" +msgid "Could not listen on address %s, port %d: " +msgstr "Không thể lắng nghe trên địa chỉ %s, cổng %d: " #: ../libsoup/soup-session.c:4543 #, c-format diff -Nru libsoup2.4-2.52.2/po/zh_CN.po libsoup2.4-2.54.1/po/zh_CN.po --- libsoup2.4-2.52.2/po/zh_CN.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/zh_CN.po 2016-04-25 17:48:49.000000000 +0000 @@ -85,8 +85,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "不能监听 %s 地址的 %d 端口" +msgid "Could not listen on address %s, port %d: " +msgstr "不能监听 %s 地址的 %d 端口:" #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/zh_HK.po libsoup2.4-2.54.1/po/zh_HK.po --- libsoup2.4-2.52.2/po/zh_HK.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/zh_HK.po 2016-04-25 17:48:49.000000000 +0000 @@ -81,8 +81,8 @@ #: ../libsoup/soup-server.c:1547 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "無法聽取位址 %s，連接埠 %d" +msgid "Could not listen on address %s, port %d: " +msgstr "無法聽取位址 %s，連接埠 %d：" #: ../libsoup/soup-session.c:4466 #, c-format diff -Nru libsoup2.4-2.52.2/po/zh_TW.po libsoup2.4-2.54.1/po/zh_TW.po --- libsoup2.4-2.52.2/po/zh_TW.po 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/po/zh_TW.po 2016-04-25 17:48:49.000000000 +0000 @@ -82,8 +82,8 @@ #: ../libsoup/soup-server.c:1730 #, c-format -msgid "Could not listen on address %s, port %d" -msgstr "無法聽取位址 %s，連接埠 %d" +msgid "Could not listen on address %s, port %d: " +msgstr "無法聽取位址 %s，連接埠 %d：" #: ../libsoup/soup-session.c:4554 #, c-format diff -Nru libsoup2.4-2.52.2/tests/header-parsing.c libsoup2.4-2.54.1/tests/header-parsing.c --- libsoup2.4-2.52.2/tests/header-parsing.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/tests/header-parsing.c 2016-02-19 14:15:46.000000000 +0000 @@ -358,6 +358,24 @@ } }, + { "NUL in header name", "760832", + "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36, + SOUP_STATUS_OK, + "GET", "/", SOUP_HTTP_1_1, + { { "Host", "example.com" }, + { NULL } + } + }, + + { "NUL in header value", "760832", + "GET / HTTP/1.1\r\nHost: example\x00" "com\r\n", 35, + SOUP_STATUS_OK, + "GET", "/", SOUP_HTTP_1_1, + { { "Host", "examplecom" }, + { NULL } + } + }, + /************************/ /*** INVALID REQUESTS ***/ /************************/ @@ -418,20 +436,6 @@ { { NULL } } }, - { "NUL in header name", "666316", - "GET / HTTP/1.1\r\n\x00: silly\r\n", 37, - SOUP_STATUS_BAD_REQUEST, - NULL, NULL, -1, - { { NULL } } - }, - - { "NUL in header value", NULL, - "GET / HTTP/1.1\r\nHost: example\x00com\r\n", 37, - SOUP_STATUS_BAD_REQUEST, - NULL, NULL, -1, - { { NULL } } - }, - { "No terminating CRLF", NULL, "GET / HTTP/1.1\r\nHost: example.com", -1, SOUP_STATUS_BAD_REQUEST, @@ -608,6 +612,22 @@ { NULL } } }, + { "NUL in header name", "760832", + "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28, + SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK", + { { "Foo", "bar" }, + { NULL } + } + }, + + { "NUL in header value", "760832", + "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28, + SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK", + { { "Foo", "bar" }, + { NULL } + } + }, + /********************************/ /*** VALID CONTINUE RESPONSES ***/ /********************************/ @@ -701,18 +721,6 @@ -1, 0, NULL, { { NULL } } }, - - { "NUL in header name", NULL, - "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28, - -1, 0, NULL, - { { NULL } } - }, - - { "NUL in header value", NULL, - "HTTP/1.1 200 OK\r\nFoo: b\x00ar\r\n", 28, - -1, 0, NULL, - { { NULL } } - }, /* Failing test from Cockpit */ diff -Nru libsoup2.4-2.52.2/tests/Makefile.in libsoup2.4-2.54.1/tests/Makefile.in --- libsoup2.4-2.52.2/tests/Makefile.in 2015-11-09 20:25:05.000000000 +0000 +++ libsoup2.4-2.54.1/tests/Makefile.in 2016-04-26 12:36:13.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -83,9 +93,6 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(top_srcdir)/glib-tap.mk $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/build-aux/depcomp \ - $(top_srcdir)/build-aux/test-driver TESTS = $(am__EXEEXT_1) installed_test_PROGRAMS = $(am__EXEEXT_6) noinst_PROGRAMS = $(am__EXEEXT_7) @@ -132,6 +139,7 @@ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -612,6 +620,9 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \ $(TEST_LOG_FLAGS) +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(top_srcdir)/build-aux/depcomp \ + $(top_srcdir)/build-aux/test-driver $(top_srcdir)/glib-tap.mk DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -638,7 +649,6 @@ CPPFLAGS = @CPPFLAGS@ CURL = @CURL@ CYGPATH_W = @CYGPATH_W@ -DATADIRNAME = @DATADIRNAME@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ DLLTOOL = @DLLTOOL@ @@ -691,6 +701,9 @@ INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@ INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@ INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@ +KRB5_CFLAGS = @KRB5_CFLAGS@ +KRB5_CONFIG = @KRB5_CONFIG@ +KRB5_LIBS = @KRB5_LIBS@ LCOV = @LCOV@ LD = @LD@ LDFLAGS = @LDFLAGS@ @@ -703,6 +716,7 @@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ @@ -734,6 +748,7 @@ SOUP_API_VERSION = @SOUP_API_VERSION@ SOUP_CURRENT = @SOUP_CURRENT@ SOUP_DEBUG_FLAGS = @SOUP_DEBUG_FLAGS@ +SOUP_HIDDEN_VISIBILITY_CFLAGS = @SOUP_HIDDEN_VISIBILITY_CFLAGS@ SOUP_MAJOR_VERSION = @SOUP_MAJOR_VERSION@ SOUP_MICRO_VERSION = @SOUP_MICRO_VERSION@ SOUP_MINOR_VERSION = @SOUP_MINOR_VERSION@ @@ -933,7 +948,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign tests/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -942,7 +956,7 @@ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; -$(top_srcdir)/glib-tap.mk: +$(top_srcdir)/glib-tap.mk $(am__empty): $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -1467,7 +1481,7 @@ if test -n "$$am__remaking_logs"; then \ echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \ "recursion detected" >&2; \ - else \ + elif test -n "$$redo_logs"; then \ am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \ fi; \ if $(am__make_dryrun); then :; else \ @@ -2038,6 +2052,8 @@ uninstall-installed_test_metaDATA \ uninstall-nobase_installed_testDATA +.PRECIOUS: Makefile + @ENABLE_INSTALLED_TESTS_TRUE@%.test: %$(EXEEXT) Makefile @ENABLE_INSTALLED_TESTS_TRUE@ $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ diff -Nru libsoup2.4-2.52.2/tests/no-ssl-test.c libsoup2.4-2.54.1/tests/no-ssl-test.c --- libsoup2.4-2.52.2/tests/no-ssl-test.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/tests/no-ssl-test.c 2016-02-19 14:15:46.000000000 +0000 @@ -58,7 +58,9 @@ g_test_bug ("700518"); + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; session = soup_session_async_new (); + G_GNUC_END_IGNORE_DEPRECATIONS; /* Temporarily undeprecate SOUP_SESSION_SSL_CA_FILE to avoid warnings. */ pspec = g_object_class_find_property (g_type_class_peek (SOUP_TYPE_SESSION), diff -Nru libsoup2.4-2.52.2/tests/ssl-test.c libsoup2.4-2.54.1/tests/ssl-test.c --- libsoup2.4-2.52.2/tests/ssl-test.c 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/tests/ssl-test.c 2016-02-19 14:15:46.000000000 +0000 @@ -154,7 +154,9 @@ SOUP_TEST_SKIP_IF_NO_TLS; + G_GNUC_BEGIN_IGNORE_DEPRECATIONS; session = soup_session_async_new (); + G_GNUC_END_IGNORE_DEPRECATIONS; /* Temporarily undeprecate SOUP_SESSION_SSL_CA_FILE to avoid warnings. */ pspec = g_object_class_find_property (g_type_class_peek (SOUP_TYPE_SESSION), diff -Nru libsoup2.4-2.52.2/tests/test-utils.h libsoup2.4-2.54.1/tests/test-utils.h --- libsoup2.4-2.52.2/tests/test-utils.h 2015-10-29 15:08:22.000000000 +0000 +++ libsoup2.4-2.54.1/tests/test-utils.h 2016-02-19 14:15:46.000000000 +0000 @@ -52,6 +52,11 @@ SOUP_TEST_REQUEST_CANCEL_AFTER_SEND_FINISH = (1 << 5), } SoupTestRequestFlags; +#undef SOUP_TYPE_SESSION_ASYNC +#define SOUP_TYPE_SESSION_ASYNC (_soup_session_async_get_type_undeprecated ()) +#undef SOUP_TYPE_SESSION_SYNC +#define SOUP_TYPE_SESSION_SYNC (_soup_session_sync_get_type_undeprecated ()) + SoupSession *soup_test_session_new (GType type, ...); void soup_test_session_abort_unref (SoupSession *session); diff -Nru libsoup2.4-2.52.2/tests/websocket-test.c libsoup2.4-2.54.1/tests/websocket-test.c --- libsoup2.4-2.52.2/tests/websocket-test.c 2015-11-09 20:21:29.000000000 +0000 +++ libsoup2.4-2.54.1/tests/websocket-test.c 2016-02-19 14:15:46.000000000 +0000 @@ -20,8 +20,6 @@ #include "test-utils.h" -#include - typedef struct { GSocket *listener; gushort port;