Request 330 (accepted)

wxsvg.changes Changed

wxsvg.spec Changed

@@ -3,17 +3,17 @@
 %define         soname      0
 
 Name:           wxsvg
-Version:        1.1.5
-Release:        1
+Version:        1.1.9
+Release:        0
 Summary:        Library to create, manipulate and render SVG files
 URL:            http://wxsvg.sourceforge.net/
-License:        LGPL
+License:        WXwindows
 Group:          System/Libraries
 Source:         http://prdownloads.sourceforge.net/wxsvg/%{name}-%{version}.tar.bz2
-Patch0:         wxsvg-1.1.5-libtoolize-fix.patch
+Patch0:         wxsvg-libtoolize-fix.patch
 BuildRoot:      %{_tmppath}/%{name}-buildroot
 BuildRequires:  autoconf automake libtool
-BuildRequires:  gcc-c++ libart_lgpl-devel libffmpeg_oldabi-devel
+BuildRequires:  gcc-c++ libart_lgpl-devel libffmpeg-devel
 %if 0%{?suse_version} > 1130
 %define         _use_internal_dependency_generator 0
 %define         __find_requires %wx_requires
@@ -51,7 +51,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
+%patch0 -p0
 
 %build
 libtoolize --force --copy

wxsvg-1.1.5-libtoolize-fix.patch Deleted

wxsvg-libtoolize-fix.patch Added

wxsvg-1.1.5.tar.bz2/ChangeLog -> wxsvg-1.1.9.tar.bz2/ChangeLog Changed

wxsvg-1.1.5.tar.bz2/INSTALL -> wxsvg-1.1.9.tar.bz2/INSTALL Changed

wxsvg-1.1.5.tar.bz2/Makefile.am -> wxsvg-1.1.9.tar.bz2/Makefile.am Changed

wxsvg-1.1.5.tar.bz2/Makefile.in -> wxsvg-1.1.9.tar.bz2/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -80,6 +80,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
 DATA = $(pkgconfig_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -94,9 +100,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^$^/*$/.*$$,\1,'; \
@@ -125,6 +133,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -155,8 +165,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -176,6 +184,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -223,6 +233,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -277,14 +290,14 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = src svgview include
-ACLOCAL_AMFLAGS = -I. -I m4
+ACLOCAL_AMFLAGS = -I m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libwxsvg.pc
 EXTRA_DIST = libwxsvg.pc.in
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -346,9 +359,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -557,7 +568,11 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -565,7 +580,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -596,6 +611,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -615,6 +632,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -643,8 +661,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -678,10 +704,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:
@@ -769,19 +800,19 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-libtool \
-	distclean-tags distcleancheck distdir distuninstallcheck 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-pkgconfigDATA 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-recursive uninstall uninstall-am \
-	uninstall-pkgconfigDATA
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic \
+	distclean-libtool distclean-tags distcleancheck distdir \
+	distuninstallcheck 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-pkgconfigDATA 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-recursive \
+	uninstall uninstall-am uninstall-pkgconfigDATA
 
 
 run: all

wxsvg-1.1.5.tar.bz2/aclocal.m4 -> wxsvg-1.1.9.tar.bz2/aclocal.m4 Changed

@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -22,8 +23,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -32,8 +33,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -167,6 +168,8 @@
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
 
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
+dnl
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -652,7 +655,7 @@
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
 configured by $0, generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -816,6 +819,7 @@
 m4_case($1,
   C,			_LT_LANG(C),
   C++,		_LT_LANG(CXX),
+  Go,			_LT_LANG(GO),
   Java,		_LT_LANG(GCJ),
   Fortran 77,		_LT_LANG(F77),
   Fortran,		_LT_LANG(FC),
@@ -837,6 +841,29 @@
 )# _LT_LANG
 
 
+m4_ifndef(AC_PROG_GO, 
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun(AC_PROG_GO,
+AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR(GOC,     Go compiler command)dnl
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+)#m4_defun
+)#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
@@ -867,6 +894,10 @@
        m4_ifdef(LT_PROG_GCJ,
 	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
 
+AC_PROVIDE_IFELSE(AC_PROG_GO,
+  LT_LANG(GO),
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
+
 AC_PROVIDE_IFELSE(LT_PROG_RC,
   LT_LANG(RC),
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
@@ -969,7 +1000,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  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
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -977,6 +1014,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi)
+
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
       lt_cv_ld_exported_symbols_list,
       lt_cv_ld_exported_symbols_list=no
@@ -988,6 +1026,7 @@
 	lt_cv_ld_exported_symbols_list=no)
 	LDFLAGS="$save_LDFLAGS"
     )
+
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
       lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -1005,7 +1044,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      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
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1050,8 +1091,8 @@
 )
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
 
@@ -1062,6 +1103,8 @@
   _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\"`'
+    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
@@ -1345,14 +1388,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        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"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1429,13 +1485,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1615,6 +1671,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1654,7 +1715,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      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
       do
@@ -2200,7 +2261,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2209,7 +2270,7 @@
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2274,7 +2335,7 @@
   ;;
 
 bsdi45*)
-  version_type=linux
+  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'
@@ -2413,7 +2474,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  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'
@@ -2421,10 +2482,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2432,7 +2489,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2450,7 +2507,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -2470,7 +2527,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  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}'
@@ -2481,7 +2538,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  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"
@@ -2542,7 +2599,7 @@
   ;;
 
 interix3-9*)
-  version_type=linux
+  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}'
@@ -2558,7 +2615,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2595,9 +2652,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  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}'
@@ -2672,7 +2729,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  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}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2741,7 +2798,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  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}'
@@ -2766,7 +2823,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2790,7 +2847,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2821,7 +2878,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  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}'
@@ -2831,7 +2888,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3253,7 +3310,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3673,6 +3730,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
@@ -4257,7 +4315,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4349,18 +4409,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ CF*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'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4520,7 +4595,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
@@ -4548,7 +4625,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4802,8 +4878,7 @@
 	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)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $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
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5099,6 +5174,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5145,10 +5221,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5161,7 +5233,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5200,7 +5272,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5642,9 +5713,6 @@
 _LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
     Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
-    If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist)
 _LT_TAGDECL(, hardcode_libdir_separator, 1,
     Whether we need a single "-rpath" flag with a separated argument)
 _LT_TAGDECL(, hardcode_direct, 0,
@@ -5798,7 +5866,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6168,7 +6235,7 @@
         esac
         ;;
 
-      freebsd12*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6929,12 +6996,18 @@
   }
 };
 _LT_EOF
+, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 )
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7131,7 +7204,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7264,7 +7336,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7447,6 +7518,73 @@
 )# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG(TAG)
+# --------------------------
+# 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'.
+m4_defun(_LT_LANG_GO_CONFIG,
+AC_REQUIRE(LT_PROG_GO)dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME($compiler)
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+)# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG(TAG)
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7516,6 +7654,13 @@
 dnl AC_DEFUN(LT_AC_PROG_GCJ, )
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN(LT_PROG_GO,
+AC_CHECK_TOOL(GOC, gccgo,)
+)
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN(LT_PROG_RC,
@@ -8180,9 +8325,24 @@
 # 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,
+    AS_HELP_STRING(--with-pic@<:@=PKGS@:>@,
 	try to use only PIC/non-PIC objects @<:@default=use both@:>@),
-    pic_mode="$withval",
+    lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac,
     pic_mode=default)
 
 test -z "$pic_mode" && pic_mode=m4_default($1, default)
@@ -8354,15 +8514,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define(LT_PACKAGE_VERSION, 2.4)
-m4_define(LT_PACKAGE_REVISION, 1.3293)
+m4_define(LT_PACKAGE_VERSION, 2.4.2)
+m4_define(LT_PACKAGE_REVISION, 1.3337)
 
 AC_DEFUN(LTVERSION_VERSION,
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?)
 _LT_DECL(, macro_revision, 0)
 )
@@ -8626,12 +8786,15 @@
 fidnl
 )# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -8641,7 +8804,7 @@
 am__api_version='1.11'
 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.11.1, ,
+m4_if($1, 1.11.3, ,
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
 )
 
@@ -8657,19 +8820,21 @@
 # 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.11.1)dnl
+AM_AUTOMAKE_VERSION(1.11.3)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, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -8751,14 +8916,14 @@
 Usually this means the macro was only invoked conditionally.)
 fi))
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -8798,6 +8963,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -8862,7 +9028,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -8927,10 +9093,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
 AC_SUBST(AMDEPBACKSLASH)dnl
 _AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
+AC_SUBST(am__nodep)dnl
+_AM_SUBST_NOTMAKE(am__nodep)dnl
 )
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -9152,12 +9321,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -9197,8 +9369,8 @@
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
+# 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9218,7 +9390,7 @@
        disable, m4_define(am_maintainer_other, enable),
        m4_define(am_maintainer_other, enable)
         m4_warn(syntax, unexpected argument to AM@&t@_MAINTAINER_MODE: $1))
-AC_MSG_CHECKING(whether to am_maintainer_other maintainer-specific portions of Makefiles)
+AC_MSG_CHECKING(whether to enable maintainer-specific portions of Makefiles)
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE(maintainer-mode,
   --am_maintainer_other-maintainer-mode  am_maintainer_other make rules and dependencies not useful
@@ -9329,12 +9501,15 @@
 fi
 )
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -9357,13 +9532,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -9371,13 +9547,13 @@
 _AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN(_AM_SET_OPTION,
 m4_define(_AM_MANGLE_OPTION($1), 1))
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN(_AM_SET_OPTIONS,
 m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
@@ -9453,12 +9629,14 @@
 fi
 AC_MSG_RESULT(yes))
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -9481,13 +9659,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST(INSTALL_STRIP_PROGRAM))
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -9496,13 +9674,13 @@
 AC_DEFUN(_AM_SUBST_NOTMAKE)
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -9524,10 +9702,11 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN(_AM_PROG_TAR,
-# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG(AMTAR, tar)
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST(AMTAR, '$${TAR-tar}')
 m4_if($1, v7,
-     am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -',
+     am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
      m4_case($1, ustar,, pax,,
               m4_fatal(Unknown tar format))
 AC_MSG_CHECKING(how to create a $1 tar archive)

wxsvg-1.1.5.tar.bz2/config.guess -> wxsvg-1.1.9.tar.bz2/config.guess Changed

@@ -2,9 +2,9 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-05-11'
+timestamp='2012-02-10'
 
 # 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
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -145,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -792,13 +790,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -807,6 +804,9 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
 	# uname -m includes "-pc" on this system.
 	echo ${UNAME_MACHINE}-mingw32
@@ -861,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -895,13 +902,16 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -943,7 +953,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -978,13 +988,13 @@
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -1315,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2

wxsvg-1.1.5.tar.bz2/config.sub -> wxsvg-1.1.9.tar.bz2/config.sub Changed

@@ -2,9 +2,9 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2011-03-23'
+timestamp='2012-02-10'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+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."
@@ -132,6 +130,10 @@
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^$.*$-$^-*-^-*$$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-^-*$//'`
     if  $basic_machine != $1 
@@ -247,17 +249,22 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
 	| alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
 	| am33_2.0 \
 	| arc | arm | armble | armelb | armv2345 | armv345lb | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -291,7 +298,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh1234 | sh24a | sh24aeb | sh23e | sh34eb | sheb | shbe | shle | sh1234le | sh3ele \
 	| sh64 | sh64le \
@@ -300,7 +307,7 @@
 	| spu \
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -315,8 +322,7 @@
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -329,7 +335,10 @@
 	strongarm | thumb | xscale)
 		basic_machine=arm-unknown
 		;;
-
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
 	xscaleeb)
 		basic_machine=armeb-unknown
 		;;
@@ -352,11 +361,13 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
 	| alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
 	| alphapca567-* | alpha64pca567-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c123* | c30-* | cjt90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
@@ -365,8 +376,10 @@
 	| f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
@@ -400,7 +413,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
 	| shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
@@ -408,10 +421,11 @@
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
 	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -711,7 +725,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -808,10 +821,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -1120,13 +1141,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	# This must be matched before tile*.
-	tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1336,7 +1352,7 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1548,9 +1564,6 @@
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout

wxsvg-1.1.5.tar.bz2/configure -> wxsvg-1.1.9.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for wxsvg 1.1.5.
+# Generated by GNU Autoconf 2.68 for wxsvg 1.1.9.
 #
 # Report bugs to <wx-svg-users@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@
 # Identity of this package.
 PACKAGE_NAME='wxsvg'
 PACKAGE_TARNAME='wxsvg'
-PACKAGE_VERSION='1.1.5'
-PACKAGE_STRING='wxsvg 1.1.5'
+PACKAGE_VERSION='1.1.9'
+PACKAGE_STRING='wxsvg 1.1.9'
 PACKAGE_BUGREPORT='wx-svg-users@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -616,10 +616,13 @@
 LTLIBOBJS
 LIBOBJS
 WX_CONFIG_NAME
-FFMPEG_LIBS
-FFMPEG_CFLAGS
-USE_FFMPEG_FALSE
-USE_FFMPEG_TRUE
+LIBAV_LIBS
+LIBAV_CFLAGS
+USE_LIBAV_FALSE
+USE_LIBAV_TRUE
+WX_VERSION_MICRO
+WX_VERSION_MINOR
+WX_VERSION_MAJOR
 WX_RESCOMP
 WX_VERSION
 WX_LIBS_STATIC
@@ -694,6 +697,7 @@
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -783,7 +787,7 @@
 with_wx_exec_prefix
 enable_debug
 enable_render
-enable_ffmpeg
+enable_libav
 with_datarootdir
 enable_dependency_tracking
 enable_shared
@@ -819,8 +823,8 @@
 PANGO_LIBS
 FONTCONFIG_CFLAGS
 FONTCONFIG_LIBS
-FFMPEG_CFLAGS
-FFMPEG_LIBS'
+LIBAV_CFLAGS
+LIBAV_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1363,7 +1367,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 wxsvg 1.1.5 to adapt to many kinds of systems.
+\`configure' configures wxsvg 1.1.9 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1433,7 +1437,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of wxsvg 1.1.5:";;
+     short | recursive ) echo "Configuration of wxsvg 1.1.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1445,7 +1449,7 @@
 			  (and sometimes confusing) to the casual installer
   --enable-debug          Enable debugging information
   --enable-render=render          Specify the render: cairo (default), libart or agg
-  --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled)
+  --enable-libav         Enable libav decoder support (default: enabled)
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-shared=PKGS  build shared libraries default=yes
@@ -1463,7 +1467,7 @@
   --with-wx-exec-prefix=PREFIX
                           Exec prefix where wxWidgets is installed (optional)
   --with-datarootdir=DIR  Use DIR as the data root PREFIX/share
-  --with-pic              try to use only PIC/non-PIC objects default=use
+  --with-pic=PKGS       try to use only PIC/non-PIC objects default=use
                           both
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -1500,9 +1504,9 @@
               C compiler flags for FONTCONFIG, overriding pkg-config
   FONTCONFIG_LIBS
               linker flags for FONTCONFIG, overriding pkg-config
-  FFMPEG_CFLAGS
-              C compiler flags for FFMPEG, overriding pkg-config
-  FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
+  LIBAV_CFLAGS
+              C compiler flags for LIBAV, overriding pkg-config
+  LIBAV_LIBS  linker flags for LIBAV, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1570,7 +1574,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-wxsvg configure 1.1.5
+wxsvg configure 1.1.9
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2056,11 +2060,42 @@
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
+
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_cxx_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_cxx_check_header_compile
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by wxsvg $as_me 1.1.5, which was
+It was created by wxsvg $as_me 1.1.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2876,7 +2911,7 @@
 
 # Define the identity of the package.
  PACKAGE='wxsvg'
- VERSION='1.1.5'
+ VERSION='1.1.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2906,11 +2941,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# 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}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -2948,7 +2983,7 @@
 # 4. If any interfaces have been added since the last public release, then increment age.
 # 5. If any interfaces have been removed since the last public release then set age to 0.
 
-LIBRARY_VERSION=4:0:4 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
+LIBRARY_VERSION=5:2:5 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
 
 
 # options
@@ -2997,11 +3032,11 @@
   USE_RENDER=cairo
 fi
 
-# Check whether --enable-ffmpeg was given.
-if test "${enable_ffmpeg+set}" = set; then :
-  enableval=$enable_ffmpeg; enable_ffmpeg=$enableval
+# Check whether --enable-libav was given.
+if test "${enable_libav+set}" = set; then :
+  enableval=$enable_libav; enable_libav=$enableval
 else
-  enable_ffmpeg=yes
+  enable_libav=yes
 fi
 
 
@@ -3895,6 +3930,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3919,6 +3955,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3978,7 +4015,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4303,6 +4340,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4362,7 +4400,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4681,8 +4719,8 @@
 
 
 
-macro_version='2.4'
-macro_revision='1.3293'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -5516,6 +5554,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5555,7 +5598,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      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
       do
@@ -5984,7 +6027,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -6625,13 +6668,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -6778,6 +6821,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
@@ -7167,7 +7211,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7178,7 +7222,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        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"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -7818,7 +7875,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  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
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7829,6 +7892,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
@@ -7861,6 +7925,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
 $as_echo_n "checking for -force_load linker flag... " >&6; }
 if ${lt_cv_ld_force_load+:} false; then :
@@ -7882,7 +7947,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      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
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&5
@@ -8297,7 +8364,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8375,6 +8457,10 @@
 
 
 
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8830,7 +8916,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       lt_prog_compiler_wl='-Xlinker '
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
       ;;
     esac
   else
@@ -8921,18 +9009,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
+        *Intel*\ CF*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
+	  lt_prog_compiler_static='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -9294,7 +9397,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9547,8 +9649,7 @@
 	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=
-	  hardcode_libdir_flag_spec_ld='-rpath $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
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
@@ -9928,6 +10029,7 @@
 	# 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
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	old_postinstall_cmds='chmod 644 $oldlib'
@@ -9973,6 +10075,7 @@
   hardcode_shlibpath_var=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
   else
     whole_archive_flag_spec=''
   fi
@@ -10001,10 +10104,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -10017,7 +10116,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10056,7 +10155,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -10680,11 +10778,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10774,7 +10867,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10783,7 +10876,7 @@
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10848,7 +10941,7 @@
   ;;
 
 bsdi45*)
-  version_type=linux
+  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'
@@ -10987,7 +11080,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  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'
@@ -10995,10 +11088,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -11006,7 +11095,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -11024,7 +11113,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -11044,7 +11133,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  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}'
@@ -11055,7 +11144,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  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"
@@ -11116,7 +11205,7 @@
   ;;
 
 interix3-9*)
-  version_type=linux
+  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}'
@@ -11132,7 +11221,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -11169,9 +11258,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  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}'
@@ -11265,7 +11354,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  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}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -11334,7 +11423,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  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}'
@@ -11359,7 +11448,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11383,7 +11472,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11414,7 +11503,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  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}'
@@ -11424,7 +11513,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -12349,7 +12438,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -12933,6 +13021,7 @@
   hardcode_shlibpath_var_CXX=unsupported
   if test "$lt_cv_ld_force_load" = "yes"; then
     whole_archive_flag_spec_CXX='`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_CXX=''
   fi
@@ -12977,7 +13066,7 @@
         esac
         ;;
 
-      freebsd12*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -13653,6 +13742,7 @@
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -14442,7 +14532,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
       exclude_expsyms_CXX='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
@@ -14598,8 +14690,6 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -14625,7 +14715,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -14634,7 +14724,7 @@
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -14699,7 +14789,7 @@
   ;;
 
 bsdi45*)
-  version_type=linux
+  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'
@@ -14836,7 +14926,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  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'
@@ -14844,10 +14934,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -14855,7 +14941,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -14873,7 +14959,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -14893,7 +14979,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  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}'
@@ -14904,7 +14990,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  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"
@@ -14965,7 +15051,7 @@
   ;;
 
 interix3-9*)
-  version_type=linux
+  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}'
@@ -14981,7 +15067,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -15018,9 +15104,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  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}'
@@ -15114,7 +15200,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  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}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -15183,7 +15269,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  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}'
@@ -15208,7 +15294,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15232,7 +15318,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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'
     shlibpath_var=LD_LIBRARY_PATH
@@ -15263,7 +15349,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  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}'
@@ -15273,7 +15359,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -15412,6 +15498,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -16201,7 +16289,7 @@
 $as_echo_n "checking for wxWidgets version >= $min_wx_version ()... " >&6; }
     fi
 
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args  "
+            WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args "
 
     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
     wx_config_major_version=`echo $WX_VERSION | \
@@ -16240,14 +16328,13 @@
 
 
     if test -n "$wx_ver_ok"; then
-
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5
 $as_echo "yes (version $WX_VERSION)" >&6; }
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs `
 
                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5
 $as_echo_n "checking for wxWidgets static library... " >&6; }
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs  2>/dev/null`
       if test "x$WX_LIBS_STATIC" = "x"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -16290,16 +16377,16 @@
       fi
 
       if test "x$wx_has_cppflags" = x ; then
-                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
          WX_CPPFLAGS=$WX_CFLAGS
          WX_CXXFLAGS=$WX_CFLAGS
 
          WX_CFLAGS_ONLY=$WX_CFLAGS
          WX_CXXFLAGS_ONLY=$WX_CFLAGS
       else
-                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags `
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags `
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
 
          WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
          WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
@@ -16323,7 +16410,32 @@
        WX_LIBS=""
        WX_LIBS_STATIC=""
        WX_RESCOMP=""
-       :
+
+       if test ! -z ""; then
+
+          wx_error_message="
+    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+    build with the following settings:
+
+    but such build is not available.
+
+    To see the wxWidgets builds available on this system, please use
+    'wx-config --list' command. To use the default build, returned by
+    'wx-config --selected-config', use the options with their 'auto'
+    default values."
+
+       fi
+
+       wx_error_message="
+    The requested wxWidgets build couldn't be found.
+    $wx_error_message
+
+    If you still get this error, then check that 'wx-config' is
+    in path, the directory where wxWidgets libraries are installed
+    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
+    or equivalent variable and wxWidgets version is 2.6.3 or above."
+
+       as_fn_error $? "$wx_error_message" "$LINENO" 5
 
     fi
   else
@@ -16349,6 +16461,13 @@
 
 
 
+      WX_VERSION_MAJOR="$wx_config_major_version"
+  WX_VERSION_MINOR="$wx_config_minor_version"
+  WX_VERSION_MICRO="$wx_config_micro_version"
+
+
+
+
 if test "$WXFOUND" != 1; then
     as_fn_error $? "
         Please check that wx-config is in path, the directory
@@ -16419,22 +16538,22 @@
 
 
 # check ffmpg
- if test x$enable_ffmpeg = xyes; then
-  USE_FFMPEG_TRUE=
-  USE_FFMPEG_FALSE='#'
+ if test x$enable_libav = xyes; then
+  USE_LIBAV_TRUE=
+  USE_LIBAV_FALSE='#'
 else
-  USE_FFMPEG_TRUE='#'
-  USE_FFMPEG_FALSE=
+  USE_LIBAV_TRUE='#'
+  USE_LIBAV_FALSE=
 fi
 
-if test x$enable_ffmpeg = xyes; then
+if test x$enable_libav = xyes; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
-$as_echo_n "checking for FFMPEG... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBAV" >&5
+$as_echo_n "checking for LIBAV... " >&6; }
 
-if test -n "$FFMPEG_CFLAGS"; then
-    pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
+if test -n "$LIBAV_CFLAGS"; then
+    pkg_cv_LIBAV_CFLAGS="$LIBAV_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale\""; } >&5
@@ -16442,7 +16561,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
+  pkg_cv_LIBAV_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -16450,8 +16569,8 @@
  else
     pkg_failed=untried
 fi
-if test -n "$FFMPEG_LIBS"; then
-    pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
+if test -n "$LIBAV_LIBS"; then
+    pkg_cv_LIBAV_LIBS="$LIBAV_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale\""; } >&5
@@ -16459,7 +16578,7 @@
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
+  pkg_cv_LIBAV_LIBS=`$PKG_CONFIG --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -16480,22 +16599,22 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>&1`
+	        LIBAV_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>&1`
         else
-	        FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>&1`
+	        LIBAV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$FFMPEG_PKG_ERRORS" >&5
+	echo "$LIBAV_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale) were not met:
 
-$FFMPEG_PKG_ERRORS
+$LIBAV_PKG_ERRORS
 
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables FFMPEG_CFLAGS
-and FFMPEG_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBAV_CFLAGS
+and LIBAV_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -16506,21 +16625,32 @@
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively, you may set the environment variables FFMPEG_CFLAGS
-and FFMPEG_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables LIBAV_CFLAGS
+and LIBAV_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
-	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
-	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
+	LIBAV_CFLAGS=$pkg_cv_LIBAV_CFLAGS
+	LIBAV_LIBS=$pkg_cv_LIBAV_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
 fi
-  CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG $FFMPEG_CFLAGS"
-  LIBS="$LIBS $FFMPEG_LIBS"
+  CXXFLAGS="$CXXFLAGS -DUSE_LIBAV $LIBAV_CFLAGS"
+  LIBS="$LIBS $LIBAV_LIBS"
+  ac_fn_cxx_check_header_compile "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "
+#define __STDC_CONSTANT_MACROS
+#define __STDC_LIMIT_MACROS
+"
+if test "x$ac_cv_header_libavformat_avformat_h" = xyes; then :
+
+else
+  as_fn_error $? "*** missing libav library" "$LINENO" 5
+fi
+
+
 fi
 
 # vars
@@ -16717,8 +16847,8 @@
   as_fn_error $? "conditional \"USE_FREETYPE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${USE_FFMPEG_TRUE}" && test -z "${USE_FFMPEG_FALSE}"; then
-  as_fn_error $? "conditional \"USE_FFMPEG\" was never defined.
+if test -z "${USE_LIBAV_TRUE}" && test -z "${USE_LIBAV_FALSE}"; then
+  as_fn_error $? "conditional \"USE_LIBAV\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
@@ -17130,7 +17260,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by wxsvg $as_me 1.1.5, which was
+This file was extended by wxsvg $as_me 1.1.9, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17187,7 +17317,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
 ac_cs_version="\\
-wxsvg config.status 1.1.5
+wxsvg config.status 1.1.9
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -17313,6 +17443,7 @@
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
@@ -17395,7 +17526,6 @@
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
@@ -17467,7 +17597,6 @@
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
@@ -17506,6 +17635,7 @@
 # Quote evaled strings.
 for var in SHELL \
 ECHO \
+PATH_SEPARATOR \
 SED \
 GREP \
 EGREP \
@@ -17556,7 +17686,6 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
 exclude_expsyms \
 include_expsyms \
@@ -17590,7 +17719,6 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
@@ -18241,8 +18369,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -18296,6 +18424,9 @@
 # An echo program that protects backslashes.
 ECHO=$lt_ECHO
 
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -18597,10 +18728,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -18943,10 +19070,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX

wxsvg-1.1.5.tar.bz2/configure.in -> wxsvg-1.1.9.tar.bz2/configure.in Changed

@@ -2,7 +2,7 @@
 
 # initialization
 AC_PREREQ(2.57)
-AC_INIT(wxsvg, 1.1.5, wx-svg-users@lists.sourceforge.net)
+AC_INIT(wxsvg, 1.1.9, wx-svg-users@lists.sourceforge.net)
 AC_CONFIG_MACRO_DIR(m4)
 AM_INIT_AUTOMAKE(foreign)
 AM_MAINTAINER_MODE
@@ -15,7 +15,7 @@
 # 4. If any interfaces have been added since the last public release, then increment age.
 # 5. If any interfaces have been removed since the last public release then set age to 0.
 
-LIBRARY_VERSION=4:0:4 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
+LIBRARY_VERSION=5:2:5 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
 AC_SUBST(LIBRARY_VERSION)
 
 # options
@@ -26,9 +26,9 @@
 AC_ARG_ENABLE(render,
    --enable-render=render          Specify the render: cairo (default), libart or agg,
  USE_RENDER=$enableval, USE_RENDER=cairo)
-AC_ARG_ENABLE(ffmpeg,
-   --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled),
- enable_ffmpeg=$enableval,enable_ffmpeg=yes)
+AC_ARG_ENABLE(libav,
+   --enable-libav         Enable libav decoder support (default: enabled),
+ enable_libav=$enableval,enable_libav=yes)
 AC_ARG_WITH(datarootdir,
    --with-datarootdir=DIR  Use DIR as the data root PREFIX/share,
  datarootdir="\${prefix}/$with_datarootdir", datarootdir='$(prefix)/share')
@@ -161,7 +161,7 @@
 AM_CONDITIONAL(USE_FREETYPE, test "$font_engine" = "freetype")
 
 # check wxWidgets >= 2.6.3
-AM_PATH_WXCONFIG(2.6.3, WXFOUND=1)
+WX_CONFIG_CHECK(2.6.3, WXFOUND=1)
 if test "$WXFOUND" != 1; then
     AC_MSG_ERROR(
         Please check that wx-config is in path, the directory
@@ -178,11 +178,14 @@
 AC_CHECK_HEADER(expat.h,,AC_MSG_ERROR(*** missing expat library))
 
 # check ffmpg
-AM_CONDITIONAL(USE_FFMPEG, test x$enable_ffmpeg = xyes)
-if test x$enable_ffmpeg = xyes; then
-  PKG_CHECK_MODULES(FFMPEG, libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale)
-  CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG $FFMPEG_CFLAGS"
-  LIBS="$LIBS $FFMPEG_LIBS"
+AM_CONDITIONAL(USE_LIBAV, test x$enable_libav = xyes)
+if test x$enable_libav = xyes; then
+  PKG_CHECK_MODULES(LIBAV, libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale)
+  CXXFLAGS="$CXXFLAGS -DUSE_LIBAV $LIBAV_CFLAGS"
+  LIBS="$LIBS $LIBAV_LIBS"
+  AC_CHECK_HEADER(libavformat/avformat.h,,AC_MSG_ERROR(*** missing libav library),
+#define __STDC_CONSTANT_MACROS
+#define __STDC_LIMIT_MACROS)
 fi
 
 # vars

wxsvg-1.1.5.tar.bz2/include/Makefile.in -> wxsvg-1.1.9.tar.bz2/include/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -115,8 +115,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -136,6 +134,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -183,6 +183,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -485,10 +488,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/include/wxSVG/Makefile.in -> wxsvg-1.1.9.tar.bz2/include/wxSVG/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkgincludedir)"
 HEADERS = $(pkginclude_HEADERS)
 ETAGS = etags
@@ -102,8 +108,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -123,6 +127,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -170,6 +176,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -280,9 +289,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -383,10 +390,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGCanvasItem.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGCanvasItem.h Changed

@@ -3,7 +3,7 @@
 // Purpose:     Canvas items
 // Author:      Alex Thuering
 // Created:     2005/05/09
-// RCS-ID:      $Id: SVGCanvasItem.h,v 1.21 2011/11/23 22:14:53 ntalex Exp $
+// RCS-ID:      $Id: SVGCanvasItem.h,v 1.22 2012/01/06 03:12:45 ntalex Exp $
 // Copyright:   (c) 2005 Alex Thuering
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -147,8 +147,8 @@
 /** Canvas item, that saves image (SVGImageElement) */
 class wxSVGCanvasImage: public wxSVGCanvasItem {
 public:
-	wxSVGCanvasImage(): wxSVGCanvasItem(wxSVG_CANVAS_ITEM_IMAGE), m_svgImage(NULL) {}
-	wxSVGCanvasImage(wxSVGCanvasItemType type): wxSVGCanvasItem(type), m_svgImage(NULL) {}
+	wxSVGCanvasImage(): wxSVGCanvasItem(wxSVG_CANVAS_ITEM_IMAGE), m_defHeightScale(1), m_svgImage(NULL) {}
+	wxSVGCanvasImage(wxSVGCanvasItemType type): wxSVGCanvasItem(type), m_defHeightScale(1), m_svgImage(NULL) {}
 	virtual ~wxSVGCanvasImage();
 	virtual void Init(wxSVGImageElement& element, const wxCSSStyleDeclaration& style);
 	virtual int GetDefaultWidth();

wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGFEGaussianBlurElement.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGFEGaussianBlurElement.h Changed

wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGRadialGradientElement.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGRadialGradientElement.h Changed

wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGStylable.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGStylable.h Changed

wxsvg-1.1.5.tar.bz2/include/wxSVGXML/Makefile.in -> wxsvg-1.1.9.tar.bz2/include/wxSVGXML/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -67,6 +67,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(pkgincludedir)"
 HEADERS = $(pkginclude_HEADERS)
 ETAGS = etags
@@ -102,8 +108,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -123,6 +127,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -170,6 +176,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -280,9 +289,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -383,10 +390,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/include/wxSVGXML/svgxml.h -> wxsvg-1.1.9.tar.bz2/include/wxSVGXML/svgxml.h Changed

@@ -3,7 +3,7 @@
 // Purpose:     wxSvgXmlDocument - XML parser & data holder class
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: svgxml.h,v 1.4 2010/02/22 20:00:42 ntalex Exp $
+// RCS-ID:      $Id: svgxml.h,v 1.5 2012/04/09 12:20:07 ntalex Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
@@ -19,6 +19,7 @@
 #include <wx/object.h>
 #include <wx/list.h>
 #include <wx/hashmap.h>
+#include <vector>
 
 class wxSvgXmlNode;
 class wxSvgXmlProperty;
@@ -75,20 +76,33 @@
     wxSvgXmlProperty *m_next;
 };
 
+class wxSvgXmlAttribute {
+public:
+	wxSvgXmlAttribute() {}
+	wxSvgXmlAttribute(const wxString& name, const wxString& value): m_name(name), m_value(value) {}
 
-WX_DECLARE_STRING_HASH_MAP(wxString, wxSvgXmlAttrHashBase);
-class wxSvgXmlAttrHash: public wxSvgXmlAttrHashBase
-{
-  public:
-    void Add(wxString key, wxString value) { (*this)key = value; }
-    void Add(const wxSvgXmlAttrHash& value)
-    {
-      wxSvgXmlAttrHash::const_iterator it; 
-      for(it = value.begin(); it != value.end(); ++it)
-        insert(*it);
-    }
+    wxString GetName() const { return m_name; }
+    wxString GetValue() const { return m_value; }
+
+    void SetName(const wxString& name) { m_name = name; }
+    void SetValue(const wxString& value) { m_value = value; }
+
+private:
+    wxString m_name;
+    wxString m_value;
 };
 
+class wxSvgXmlAttrHash: public std::vector<wxSvgXmlAttribute> {
+public:
+    void Add(wxString name, wxString value) {
+		push_back(wxSvgXmlAttribute(name, value));
+	}
+	void Add(const wxSvgXmlAttrHash& value) {
+		wxSvgXmlAttrHash::const_iterator it;
+		for (it = value.begin(); it != value.end(); ++it)
+			push_back(*it);
+	}
+};
 
 // Represents node in XML document. Node has name and may have content
 // and properties. Most common node types are wxSVGXML_TEXT_NODE (name and props

wxsvg-1.1.5.tar.bz2/ltmain.sh -> wxsvg-1.1.9.tar.bz2/ltmain.sh Changed

@@ -1,9 +1,9 @@
 
-# libtool (GNU libtool) 2.4
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2008, 2009, 2010, 2011 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.
 
@@ -41,6 +41,7 @@
 #       --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
@@ -69,7 +70,7 @@
 #         compiler:		$LTCC
 #         compiler flags:		$LTCFLAGS
 #         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4 Debian-2.4-2ubuntu1
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
 #         automake:	$automake_version
 #         autoconf:	$autoconf_version
 #
@@ -79,9 +80,9 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4 Debian-2.4-2ubuntu1"
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
 TIMESTAMP=""
-package_revision=1.3293
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -136,15 +137,10 @@
 
 : ${CP="cp -f"}
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -387,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -771,8 +767,8 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
 	d
      }
@@ -1052,6 +1048,7 @@
 opt_help=false
 opt_help_all=false
 opt_silent=:
+opt_warning=:
 opt_verbose=:
 opt_silent=false
 opt_verbose=false
@@ -1120,6 +1117,10 @@
 			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"
@@ -2059,7 +2060,7 @@
     *.cCFSifmso | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.fF09? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
+    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -3201,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -3470,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -3982,14 +3985,17 @@
 # launches target application with the remaining arguments.
 func_exec_program ()
 {
-  for lt_wr_arg
-  do
-    case \$lt_wr_arg in
-    --lt-*) ;;
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-    esac
-    shift
-  done
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
   func_exec_program_core \${1+\"\$@\"}
 }
 
@@ -5057,9 +5063,15 @@
 {
 EOF
 	    func_emit_wrapper yes |
-              $SED -e 's/$\\"$/\\\1/g' \
-	           -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
-
+	      $SED -n -e '
+s/^$.\{79\}$$..*$/\1\
+\2/
+h
+s/$\\"$/\\\1/g
+s/$/\\n/
+s/$^\n*$.*/  fputs ("\1", f);/p
+g
+D'
             cat <<"EOF"
 }
 EOF
@@ -5643,7 +5655,8 @@
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
@@ -6150,7 +6163,8 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -6834,7 +6848,7 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		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
@@ -7319,6 +7333,7 @@
 	  # which 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)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
@@ -7438,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -8026,6 +8041,11 @@
 
       # 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.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
@@ -8056,7 +8076,7 @@
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) func_apped perm_rpath " $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -8064,11 +8084,7 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
@@ -9158,6 +9174,8 @@
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
@@ -9267,7 +9285,8 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=$.*$$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		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_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"

wxsvg-1.1.5.tar.bz2/m4/libtool.m4 -> wxsvg-1.1.9.tar.bz2/m4/libtool.m4 Changed

@@ -1,8 +1,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -11,8 +11,8 @@
 
 m4_define(_LT_COPYING, dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
-#                 Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -146,6 +146,8 @@
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
 
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
+dnl
 _LT_DECL(, host_alias, 0, The host system)dnl
 _LT_DECL(, host, 0)dnl
 _LT_DECL(, host_os, 0)dnl
@@ -637,7 +639,7 @@
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
 configured by $0, generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -801,6 +803,7 @@
 m4_case($1,
   C,			_LT_LANG(C),
   C++,		_LT_LANG(CXX),
+  Go,			_LT_LANG(GO),
   Java,		_LT_LANG(GCJ),
   Fortran 77,		_LT_LANG(F77),
   Fortran,		_LT_LANG(FC),
@@ -822,6 +825,31 @@
 )# _LT_LANG
 
 
+m4_ifndef(AC_PROG_GO, 
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun(AC_PROG_GO,
+AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR(GOC,     Go compiler command)dnl
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+)#m4_defun
+)#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
@@ -852,6 +880,10 @@
        m4_ifdef(LT_PROG_GCJ,
 	m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
 
+AC_PROVIDE_IFELSE(AC_PROG_GO,
+  LT_LANG(GO),
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
+
 AC_PROVIDE_IFELSE(LT_PROG_RC,
   LT_LANG(RC),
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
@@ -954,7 +986,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  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
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -962,6 +1000,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi)
+
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
       lt_cv_ld_exported_symbols_list,
       lt_cv_ld_exported_symbols_list=no
@@ -973,6 +1012,7 @@
 	lt_cv_ld_exported_symbols_list=no)
 	LDFLAGS="$save_LDFLAGS"
     )
+
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
       lt_cv_ld_force_load=no
       cat > conftest.c << _LT_EOF
@@ -990,7 +1030,9 @@
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
       _lt_result=$?
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
+      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
 	lt_cv_ld_force_load=yes
       else
 	cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1035,8 +1077,8 @@
 )
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES(TAG)
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
 
@@ -1047,6 +1089,8 @@
   _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\"`'
+    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
@@ -1330,14 +1374,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        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"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1414,13 +1471,13 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
 case $host_os in
@@ -1600,6 +1657,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1639,7 +1701,7 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
+      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
       do
@@ -2185,7 +2247,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2194,7 +2256,7 @@
   ;;
 
 aix4-9*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2259,7 +2321,7 @@
   ;;
 
 bsdi45*)
-  version_type=linux
+  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'
@@ -2398,7 +2460,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  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'
@@ -2406,10 +2468,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2417,7 +2475,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd123*) objformat=aout ;;
+    freebsd23.*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2435,7 +2493,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.01* | freebsdelf3.01*)
@@ -2455,7 +2513,7 @@
   ;;
 
 gnu*)
-  version_type=linux
+  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}'
@@ -2466,7 +2524,7 @@
   ;;
 
 haiku*)
-  version_type=linux
+  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"
@@ -2527,7 +2585,7 @@
   ;;
 
 interix3-9*)
-  version_type=linux
+  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}'
@@ -2543,7 +2601,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2580,9 +2638,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+  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}'
@@ -2657,7 +2715,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  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}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2726,7 +2784,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  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}'
@@ -2751,7 +2809,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2775,7 +2833,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    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'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2806,7 +2864,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  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}'
@@ -2816,7 +2874,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  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'
   shlibpath_var=LD_LIBRARY_PATH
@@ -3238,7 +3296,7 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
+# This must be glibc/ELF.
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3658,6 +3716,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF $^|$*()/{next};"\
@@ -4242,7 +4301,9 @@
     case $cc_basename in
     nvcc*) # Cuda Compiler Driver 2.2
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
       ;;
     esac
   else
@@ -4334,18 +4395,33 @@
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ F* | *Sun*Fortran*)
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
 	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
+        *Intel*\ CF*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'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
 	esac
 	;;
       esac
@@ -4505,7 +4581,9 @@
     ;;
   cygwin* | mingw* | cegcc*)
     case $cc_basename in
-    cl*) ;;
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
     *)
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1 DATA/;s/^.* __nm__$^ *$ ^ */\1 DATA/;/^I /d;/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
       _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
@@ -4533,7 +4611,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4787,8 +4864,7 @@
 	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)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $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
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
@@ -5084,6 +5160,7 @@
 	# The linker will not automatically build a static lib if we build a DLL.
 	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
 	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
 	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* $^ *$/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
 	# Don't use ranlib
 	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
@@ -5130,10 +5207,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -5146,7 +5219,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5185,7 +5258,6 @@
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -5627,9 +5699,6 @@
 _LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
     Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist)
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
-    If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist)
 _LT_TAGDECL(, hardcode_libdir_separator, 1,
     Whether we need a single "-rpath" flag with a separated argument)
 _LT_TAGDECL(, hardcode_direct, 0,
@@ -5787,7 +5856,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -6157,7 +6225,7 @@
         esac
         ;;
 
-      freebsd12*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -6918,12 +6986,18 @@
   }
 };
 _LT_EOF
+, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 )
 
 _lt_libdeps_save_CFLAGS=$CFLAGS
 case "$CC $CFLAGS " in #(
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
 esac
 
 dnl Parse the compiler output and extract the necessary
@@ -7120,7 +7194,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7253,7 +7326,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -7440,6 +7512,77 @@
 )# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG(TAG)
+# --------------------------
+# 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'.
+m4_defun(_LT_LANG_GO_CONFIG,
+AC_REQUIRE(LT_PROG_GO)dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME($compiler)
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+)# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG(TAG)
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -7509,6 +7652,13 @@
 dnl AC_DEFUN(LT_AC_PROG_GCJ, )
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN(LT_PROG_GO,
+AC_CHECK_TOOL(GOC, gccgo,)
+)
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN(LT_PROG_RC,

wxsvg-1.1.5.tar.bz2/m4/ltoptions.m4 -> wxsvg-1.1.9.tar.bz2/m4/ltoptions.m4 Changed

wxsvg-1.1.5.tar.bz2/m4/ltversion.m4 -> wxsvg-1.1.9.tar.bz2/m4/ltversion.m4 Changed

wxsvg-1.1.5.tar.bz2/scripts/genGetAttributes.py -> wxsvg-1.1.9.tar.bz2/scripts/genGetAttributes.py Changed

wxsvg-1.1.5.tar.bz2/scripts/generate.py -> wxsvg-1.1.9.tar.bz2/scripts/generate.py Changed

@@ -3,7 +3,7 @@
 ## Purpose:     generates the most headers from idl, but with some changes
 ## Author:      Alex Thuering
 ## Created:     2005/01/19
-## RCS-ID:      $Id: generate.py,v 1.20 2011/06/23 11:27:04 ntalex Exp $
+## RCS-ID:      $Id: generate.py,v 1.21 2012/01/08 02:42:14 ntalex Exp $
 ## Copyright:   (c) 2005 Alex Thuering
 ## Notes:       some modules adapted from svgl project
 ##############################################################################
@@ -472,6 +472,7 @@
                 protected = protected + '    bool HasCustomAttribute(const wxString& name);\n';
                 protected = protected + '    wxString GetCustomAttribute(const wxString& name);\n';
                 protected = protected + '    bool SetCustomAttribute(const wxString& name, const wxString& value);\n';
+                protected = protected + '    wxSvgXmlAttrHash GetCustomAttributes() const;\n';
 
         element_string=None
         if mapDtdIdl.elements_idl_dtd.has_key(classdecl):
@@ -569,7 +570,7 @@
 // Purpose:     
 // Author:      Alex Thuering
 // Created:     2005/04/29
-// RCS-ID:      $Id: generate.py,v 1.20 2011/06/23 11:27:04 ntalex Exp $
+// RCS-ID:      $Id: generate.py,v 1.21 2012/01/08 02:42:14 ntalex Exp $
 // Copyright:   (c) 2005 Alex Thuering
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

wxsvg-1.1.5.tar.bz2/scripts/interfaces.py -> wxsvg-1.1.9.tar.bz2/scripts/interfaces.py Changed

@@ -3,7 +3,7 @@
 ## Purpose:     
 ## Author:      Alex Thuering
 ## Created:     2005/01/19
-## RCS-ID:      $Id: interfaces.py,v 1.31 2011/11/23 23:07:15 ntalex Exp $
+## RCS-ID:      $Id: interfaces.py,v 1.32 2012/04/01 20:36:25 ntalex Exp $
 ## Copyright:   (c) 2005 Alex Thuering
 ## Notes:		some modules adapted from svgl project
 ##############################################################################
@@ -379,6 +379,17 @@
 inter.include_methods.append('    inline void SetX(const wxSVGLength& n) { wxSVGLengthList list; list.Add(n); SetX(list); }\n')
 inter.include_methods.append('    inline void SetY(const wxSVGLength& n) { wxSVGLengthList list; list.Add(n); SetY(list); }\n')
 
+# SVGRadialGradientElement
+inter = interface()
+interfaces"SVGRadialGradientElement"=inter
+inter.include_methods.append('''
+    double GetQualifiedR() const;
+    double GetQualifiedCx() const;
+    double GetQualifiedCy() const;
+    double GetQualifiedFx() const;
+    double GetQualifiedFy() const;\n
+''')
+
 # SVGDocument
 inter = interface()
 interfaces"SVGDocument"=inter

wxsvg-1.1.5.tar.bz2/src/Elements_GetAttributes.cpp -> wxsvg-1.1.9.tar.bz2/src/Elements_GetAttributes.cpp Changed

wxsvg-1.1.5.tar.bz2/src/Makefile.am -> wxsvg-1.1.9.tar.bz2/src/Makefile.am Changed

@@ -21,8 +21,8 @@
 TEXT_LIB = 
 endif
 
-if USE_FFMPEG
-FFMPEG_SRC = mediadec_ffmpeg.cpp
+if USE_LIBAV
+LIBAV_SRC = mediadec_ffmpeg.cpp
 endif
 
 SUBDIRS = svgxml $(TEXT_DIR) $(RENDER_DIR)
@@ -32,7 +32,7 @@
   SVGAnimationElement.cpp SVGCircleElement.cpp SVGEllipseElement.cpp\
   SVGFEGaussianBlurElement.cpp SVGFilterElement.cpp SVGImageElement.cpp\
   SVGLineElement.cpp SVGLocatable.cpp SVGMarkerElement.cpp SVGPathElement.cpp\
-  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp\
+  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp SVGRadialGradientElement.cpp\
   SVGSVGElement.cpp SVGTextContentElement.cpp SVGTextElement.cpp\
   SVGUseElement.cpp SVGVideoElement.cpp\
   SVGAngle.cpp SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp\
@@ -44,7 +44,7 @@
   Elements_CopyConstructors.cpp Elements_HasAttribute.cpp\
   Elements_GetAttribute.cpp Elements_GetAttributes.cpp Elements_SetAttribute.cpp\
   CSSValue.cpp CSSStyleDeclaration.cpp\
-  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(FFMPEG_SRC)
+  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(LIBAV_SRC)
 
 libwxsvg_la_LIBADD = svgxml/libwxsvgxml.la $(RENDER_LIB) $(TEXT_LIB)
 libwxsvg_la_LDFLAGS = -no-undefined -version-info @LIBRARY_VERSION@

wxsvg-1.1.5.tar.bz2/src/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -65,6 +65,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 @USE_FREETYPE_TRUE@am__DEPENDENCIES_1 = freetype/libwxsvg_freetype.la
@@ -76,31 +82,32 @@
 	SVGFilterElement.cpp SVGImageElement.cpp SVGLineElement.cpp \
 	SVGLocatable.cpp SVGMarkerElement.cpp SVGPathElement.cpp \
 	SVGPolylineElement.cpp SVGPolygonElement.cpp \
-	SVGRectElement.cpp SVGSVGElement.cpp SVGTextContentElement.cpp \
-	SVGTextElement.cpp SVGUseElement.cpp SVGVideoElement.cpp \
-	SVGAngle.cpp SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp \
-	SVGMatrix.cpp SVGPaint.cpp SVGPoint.cpp \
-	SVGPreserveAspectRatio.cpp SVGRect.cpp SVGTests.cpp \
-	SVGTransform.cpp SVGFitToViewBox.cpp SVGStylable.cpp \
-	SVGTransformable.cpp SVGElementInstanceList.cpp \
-	SVGLengthList.cpp SVGNumberList.cpp SVGPathSegList.cpp \
-	SVGPointList.cpp SVGStringList.cpp SVGTransformList.cpp \
-	Elements_CopyConstructors.cpp Elements_HasAttribute.cpp \
-	Elements_GetAttribute.cpp Elements_GetAttributes.cpp \
-	Elements_SetAttribute.cpp CSSValue.cpp CSSStyleDeclaration.cpp \
-	SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp \
-	mediadec_ffmpeg.cpp
-@USE_FFMPEG_TRUE@am__objects_1 = mediadec_ffmpeg.lo
+	SVGRectElement.cpp SVGRadialGradientElement.cpp \
+	SVGSVGElement.cpp SVGTextContentElement.cpp SVGTextElement.cpp \
+	SVGUseElement.cpp SVGVideoElement.cpp SVGAngle.cpp \
+	SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp SVGMatrix.cpp \
+	SVGPaint.cpp SVGPoint.cpp SVGPreserveAspectRatio.cpp \
+	SVGRect.cpp SVGTests.cpp SVGTransform.cpp SVGFitToViewBox.cpp \
+	SVGStylable.cpp SVGTransformable.cpp \
+	SVGElementInstanceList.cpp SVGLengthList.cpp SVGNumberList.cpp \
+	SVGPathSegList.cpp SVGPointList.cpp SVGStringList.cpp \
+	SVGTransformList.cpp Elements_CopyConstructors.cpp \
+	Elements_HasAttribute.cpp Elements_GetAttribute.cpp \
+	Elements_GetAttributes.cpp Elements_SetAttribute.cpp \
+	CSSValue.cpp CSSStyleDeclaration.cpp SVGCanvas.cpp \
+	SVGCanvasItem.cpp NodeList.cpp mediadec_ffmpeg.cpp
+@USE_LIBAV_TRUE@am__objects_1 = mediadec_ffmpeg.lo
 am_libwxsvg_la_OBJECTS = SVGDocument.lo svgctrl.lo imagsvg.lo \
 	SVGAnimationElement.lo SVGCircleElement.lo \
 	SVGEllipseElement.lo SVGFEGaussianBlurElement.lo \
 	SVGFilterElement.lo SVGImageElement.lo SVGLineElement.lo \
 	SVGLocatable.lo SVGMarkerElement.lo SVGPathElement.lo \
 	SVGPolylineElement.lo SVGPolygonElement.lo SVGRectElement.lo \
-	SVGSVGElement.lo SVGTextContentElement.lo SVGTextElement.lo \
-	SVGUseElement.lo SVGVideoElement.lo SVGAngle.lo SVGColor.lo \
-	GetSVGDocument.lo SVGLength.lo SVGMatrix.lo SVGPaint.lo \
-	SVGPoint.lo SVGPreserveAspectRatio.lo SVGRect.lo SVGTests.lo \
+	SVGRadialGradientElement.lo SVGSVGElement.lo \
+	SVGTextContentElement.lo SVGTextElement.lo SVGUseElement.lo \
+	SVGVideoElement.lo SVGAngle.lo SVGColor.lo GetSVGDocument.lo \
+	SVGLength.lo SVGMatrix.lo SVGPaint.lo SVGPoint.lo \
+	SVGPreserveAspectRatio.lo SVGRect.lo SVGTests.lo \
 	SVGTransform.lo SVGFitToViewBox.lo SVGStylable.lo \
 	SVGTransformable.lo SVGElementInstanceList.lo SVGLengthList.lo \
 	SVGNumberList.lo SVGPathSegList.lo SVGPointList.lo \
@@ -198,8 +205,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -219,6 +224,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -266,6 +273,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -329,14 +339,14 @@
 @USE_FREETYPE_TRUE@TEXT_DIR = freetype
 @USE_FREETYPE_FALSE@TEXT_LIB = 
 @USE_FREETYPE_TRUE@TEXT_LIB = freetype/libwxsvg_freetype.la
-@USE_FFMPEG_TRUE@FFMPEG_SRC = mediadec_ffmpeg.cpp
+@USE_LIBAV_TRUE@LIBAV_SRC = mediadec_ffmpeg.cpp
 SUBDIRS = svgxml $(TEXT_DIR) $(RENDER_DIR)
 lib_LTLIBRARIES = libwxsvg.la
 libwxsvg_la_SOURCES = SVGDocument.cpp svgctrl.cpp imagsvg.cpp\
   SVGAnimationElement.cpp SVGCircleElement.cpp SVGEllipseElement.cpp\
   SVGFEGaussianBlurElement.cpp SVGFilterElement.cpp SVGImageElement.cpp\
   SVGLineElement.cpp SVGLocatable.cpp SVGMarkerElement.cpp SVGPathElement.cpp\
-  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp\
+  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp SVGRadialGradientElement.cpp\
   SVGSVGElement.cpp SVGTextContentElement.cpp SVGTextElement.cpp\
   SVGUseElement.cpp SVGVideoElement.cpp\
   SVGAngle.cpp SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp\
@@ -348,7 +358,7 @@
   Elements_CopyConstructors.cpp Elements_HasAttribute.cpp\
   Elements_GetAttribute.cpp Elements_GetAttributes.cpp Elements_SetAttribute.cpp\
   CSSValue.cpp CSSStyleDeclaration.cpp\
-  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(FFMPEG_SRC)
+  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(LIBAV_SRC)
 
 libwxsvg_la_LIBADD = svgxml/libwxsvgxml.la $(RENDER_LIB) $(TEXT_LIB)
 libwxsvg_la_LDFLAGS = -no-undefined -version-info @LIBRARY_VERSION@
@@ -418,7 +428,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwxsvg.la: $(libwxsvg_la_OBJECTS) $(libwxsvg_la_DEPENDENCIES) 
+libwxsvg.la: $(libwxsvg_la_OBJECTS) $(libwxsvg_la_DEPENDENCIES) $(EXTRA_libwxsvg_la_DEPENDENCIES) 
 	$(libwxsvg_la_LINK) -rpath $(libdir) $(libwxsvg_la_OBJECTS) $(libwxsvg_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -464,6 +474,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGPolygonElement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGPolylineElement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGPreserveAspectRatio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGRadialGradientElement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGRect.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGRectElement.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGSVGElement.Plo@am__quote@
@@ -719,10 +730,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/src/SVGCanvas.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGCanvas.cpp Changed

@@ -3,7 +3,7 @@
 // Purpose:     wxSVGCanvas - Base class for SVG renders (backends)
 // Author:      Alex Thuering
 // Created:     2005/05/04
-// RCS-ID:      $Id: SVGCanvas.cpp,v 1.16 2011/11/23 22:15:16 ntalex Exp $
+// RCS-ID:      $Id: SVGCanvas.cpp,v 1.19 2012/04/09 11:44:50 ntalex Exp $
 // Copyright:   (c) 2005 Alex Thuering
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
@@ -246,7 +246,7 @@
 			wxSVGImageElement* imgElem1 = (wxSVGImageElement*) elem1;
 			if (imgElem1->GetHref().GetAnimVal().length()) {
 				if (imgElem1->GetCanvasItem() == NULL
-						|| ((wxSVGCanvasImage*) imgElem1->GetCanvasItem())->m_href != imgElem1->GetHref())
+						|| ((wxSVGCanvasImage*) imgElem1->GetCanvasItem())->m_href != imgElem1->GetHref().GetAnimVal())
 					imgElem1->SetCanvasItem(CreateItem(imgElem1));
 				((wxSVGImageElement*) elem2)->SetCanvasItem(CreateItem(imgElem1));
 			}
@@ -255,7 +255,7 @@
 			wxSVGVideoElement* vElem1 = (wxSVGVideoElement*) elem1;
 			if (vElem1->GetHref().GetAnimVal().length()) {
 				if (vElem1->GetCanvasItem() == NULL
-						|| ((wxSVGCanvasVideo*) vElem1->GetCanvasItem())->m_href != vElem1->GetHref())
+						|| ((wxSVGCanvasVideo*) vElem1->GetCanvasItem())->m_href != vElem1->GetHref().GetAnimVal())
 					vElem1->SetCanvasItem(CreateItem(vElem1));
 				((wxSVGVideoElement*) elem2)->SetCanvasItem(CreateItem(vElem1));
 			}
@@ -276,6 +276,8 @@
 	switch (elem->GetDtd()) {
 	case wxSVG_SVG_ELEMENT: {
 		wxSVGSVGElement* element = (wxSVGSVGElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		if (element->GetWidth().GetAnimVal().GetUnitType() == wxSVG_LENGTHTYPE_UNKNOWN)
 			((wxSVGAnimatedLength&) element->GetWidth()).SetAnimVal( wxSVGLength(wxSVG_LENGTHTYPE_PERCENTAGE, 100));
 		if (element->GetHeight().GetAnimVal().GetUnitType() == wxSVG_LENGTHTYPE_UNKNOWN)
@@ -294,6 +296,8 @@
 	}
 	case wxSVG_G_ELEMENT: {
 		wxSVGGElement* element = (wxSVGGElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		RenderChilds(elem, rect, &matrix, &style, ownerSVGElement, viewportElement);
@@ -301,6 +305,8 @@
 	}
 	case wxSVG_LINE_ELEMENT: {
 		wxSVGLineElement* element = (wxSVGLineElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawLine(element, &matrix, &style);
@@ -308,6 +314,8 @@
 	}
 	case wxSVG_POLYLINE_ELEMENT: {
 		wxSVGPolylineElement* element = (wxSVGPolylineElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawPolyline(element, &matrix, &style);
@@ -315,6 +323,8 @@
 	}
 	case wxSVG_POLYGON_ELEMENT: {
 		wxSVGPolygonElement* element = (wxSVGPolygonElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawPolygon(element, &matrix, &style);
@@ -322,6 +332,8 @@
 	}
 	case wxSVG_RECT_ELEMENT: {
 		wxSVGRectElement* element = (wxSVGRectElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawRect(element, &matrix, &style);
@@ -329,6 +341,8 @@
 	}
 	case wxSVG_CIRCLE_ELEMENT: {
 		wxSVGCircleElement* element = (wxSVGCircleElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawCircle(element, &matrix, &style);
@@ -336,6 +350,8 @@
 	}
 	case wxSVG_ELLIPSE_ELEMENT: {
 		wxSVGEllipseElement* element = (wxSVGEllipseElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawEllipse(element, &matrix, &style);
@@ -343,6 +359,8 @@
 	}
 	case wxSVG_PATH_ELEMENT: {
 		wxSVGPathElement* element = (wxSVGPathElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawPath(element, &matrix, &style);
@@ -352,6 +370,8 @@
 		break;
 	case wxSVG_TEXT_ELEMENT: {
 		wxSVGTextElement* element = (wxSVGTextElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawText(element, &matrix, &style);
@@ -359,6 +379,8 @@
 	}
 	case wxSVG_IMAGE_ELEMENT: {
 		wxSVGImageElement* element = (wxSVGImageElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		DrawImage(element, &matrix, &style, rect);
@@ -366,9 +388,11 @@
 	}
 	case wxSVG_VIDEO_ELEMENT: {
 		wxSVGVideoElement* element = (wxSVGVideoElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
 		DrawVideo(element, &matrix, &style);
 #else
 		wxSVGGElement* gElem = new wxSVGGElement();
@@ -400,6 +424,8 @@
 	}
 	case wxSVG_USE_ELEMENT: {
 		wxSVGUseElement* element = (wxSVGUseElement*) elem;
+		if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
+			break;
 		element->UpdateMatrix(matrix);
 		style.Add(element->GetStyle());
 		// test if visible

wxsvg-1.1.5.tar.bz2/src/SVGCanvasItem.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGCanvasItem.cpp Changed

@@ -3,7 +3,7 @@
 // Purpose:     
 // Author:      Alex Thuering
 // Created:     2005/05/09
-// RCS-ID:      $Id: SVGCanvasItem.cpp,v 1.38 2011/11/24 00:02:55 ntalex Exp $
+// RCS-ID:      $Id: SVGCanvasItem.cpp,v 1.41 2012/06/24 22:36:58 ntalex Exp $
 // Copyright:   (c) 2005 Alex Thuering
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 #include <math.h>
 #include <wx/log.h>
 
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
 #include <wxSVG/mediadec_ffmpeg.h>
 #endif
 
@@ -872,26 +872,32 @@
 	} else if (m_href.length()) {
 		long pos = 0;
 		wxString filename = m_href;
-		if (!wxFileExists(filename) && m_href.Find(wxT('#')) != wxNOT_FOUND && m_href.AfterLast(wxT('#')).ToLong(&pos))
-			filename = m_href.BeforeLast(wxT('#'));
-		if (!wxFileExists(filename)) {
-			wxLogError(_("Can't load image from file '%s': file does not exist."), filename.c_str());
-			return;
-		}
-		if (element.GetHref().GetAnimVal().EndsWith(wxT(".svg"))) {
-			wxSVGDocument imgDoc;
-			if (imgDoc.Load(filename) && imgDoc.GetRootElement() != NULL) {
-				m_svgImage = imgDoc.GetRootElement();
-				imgDoc.RemoveChild(m_svgImage);
-				if (m_svgImage->GetViewBox().GetBaseVal().IsEmpty()
-						&& m_svgImage->GetWidth().GetBaseVal().GetValue() > 0
-						&& m_svgImage->GetWidth().GetBaseVal().GetUnitType() != wxSVG_LENGTHTYPE_PERCENTAGE)
-					m_svgImage->SetViewBox(
-							wxSVGRect(0, 0, m_svgImage->GetWidth().GetBaseVal(), m_svgImage->GetHeight().GetBaseVal()));
+		if (filename.StartsWith(wxT("concat:"))) {
+			if (filename.Find(wxT('#')) != wxNOT_FOUND && filename.AfterLast(wxT('#')).ToLong(&pos))
+				filename = filename.BeforeLast(wxT('#'));
+		} else {
+			if (!wxFileExists(filename) && filename.Find(wxT('#')) != wxNOT_FOUND
+					&& filename.AfterLast(wxT('#')).ToLong(&pos))
+				filename = filename.BeforeLast(wxT('#'));
+			if (!wxFileExists(filename)) {
+				wxLogError(_("Can't load image from file '%s': file does not exist."), filename.c_str());
+				return;
+			}
+			if (element.GetHref().GetAnimVal().EndsWith(wxT(".svg"))) {
+				wxSVGDocument imgDoc;
+				if (imgDoc.Load(filename) && imgDoc.GetRootElement() != NULL) {
+					m_svgImage = imgDoc.GetRootElement();
+					imgDoc.RemoveChild(m_svgImage);
+					if (m_svgImage->GetViewBox().GetBaseVal().IsEmpty()
+							&& m_svgImage->GetWidth().GetBaseVal().GetValue() > 0
+							&& m_svgImage->GetWidth().GetBaseVal().GetUnitType() != wxSVG_LENGTHTYPE_PERCENTAGE)
+						m_svgImage->SetViewBox(
+								wxSVGRect(0, 0, m_svgImage->GetWidth().GetBaseVal(), m_svgImage->GetHeight().GetBaseVal()));
+				}
+				return;
 			}
-			return;
 		}
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
 		bool log = wxLog::EnableLogging(false);
 		m_image.LoadFile(filename);
 		wxLog::EnableLogging(log);
@@ -951,12 +957,12 @@
 }
 
 wxSVGCanvasVideoData::~wxSVGCanvasVideoData() {
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
 	if (m_mediaDecoder)
 		delete m_mediaDecoder;
 #endif
 }
-	
+
 wxSVGCanvasVideo::wxSVGCanvasVideo(): wxSVGCanvasImage(wxSVG_CANVAS_ITEM_VIDEO), m_videoData(NULL) {
 	// nothing to do
 }
@@ -973,6 +979,7 @@
 	m_height = element.GetHeight().GetAnimVal();
 	m_href = element.GetHref();
 	m_preserveAspectRatio = element.GetPreserveAspectRatio();
+	m_defHeightScale = 1;
 	m_time = element.GetOwnerDocument() != NULL ? ((wxSVGDocument*) element.GetOwnerDocument())->GetCurrentTime() : 0;
 	if (element.GetBegin() > 0)
 		m_time = m_time > element.GetBegin() ? m_time - element.GetBegin() : 0;
@@ -980,12 +987,13 @@
 	if (dur > 0 && m_time > dur)
 		m_time = dur;
 	m_time += element.GetClipBegin();
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
 	wxSVGCanvasVideo* prevItem = (wxSVGCanvasVideo*) element.GetCanvasItem();
 	if (prevItem != NULL && prevItem->m_href == m_href && prevItem->m_videoData != NULL) {
 		m_videoData = prevItem->m_videoData;
 		m_videoData->IncRef();
 		m_duration = prevItem->m_duration;
+		m_defHeightScale = prevItem->m_defHeightScale;
 		wxFfmpegMediaDecoder* decoder = m_videoData->GetMediaDecoder();
 		if (decoder != NULL) {
 			double ftime = decoder->GetFps() != -1 ? 1.0 / decoder->GetFps() : 0.04;
@@ -1023,6 +1031,8 @@
 			} else
 				m_image = decoder->GetNextFrame();
 			m_videoData = new wxSVGCanvasVideoData(decoder);
+			if (m_image.Ok() && decoder->GetFrameAspectRatio() > 0)
+				m_defHeightScale = ((double)m_image.GetWidth())/m_image.GetHeight()/decoder->GetFrameAspectRatio();
 		} else {
 			delete decoder;
 			m_duration = 0;

wxsvg-1.1.5.tar.bz2/src/SVGFEGaussianBlurElement.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGFEGaussianBlurElement.cpp Changed

wxsvg-1.1.9.tar.bz2/src/SVGRadialGradientElement.cpp Added

@@ -0,0 +1,30 @@
+//////////////////////////////////////////////////////////////////////////////
+// Name:        SVGRadialGradientElement.cpp
+// Author:      Alex Thuering
+// Created:     2012/04/01
+// RCS-ID:      $Id: SVGRadialGradientElement.cpp,v 1.1 2012/04/01 20:36:08 ntalex Exp $
+// Copyright:   (c) 2012 Alex Thuering
+// Licence:     wxWindows licence
+//////////////////////////////////////////////////////////////////////////////
+
+#include "SVGRadialGradientElement.h"
+
+double wxSVGRadialGradientElement::GetQualifiedR() const {
+	return m_r.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_r.GetAnimVal().GetValue() : 0.5;
+}
+
+double wxSVGRadialGradientElement::GetQualifiedCx() const {
+	return m_cx.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_cx.GetAnimVal().GetValue() : 0.5;
+}
+
+double wxSVGRadialGradientElement::GetQualifiedCy() const {
+	return m_cy.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_cy.GetAnimVal().GetValue() : 0.5;
+}
+
+double wxSVGRadialGradientElement::GetQualifiedFx() const {
+	return m_fx.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_fx.GetAnimVal().GetValue() : GetQualifiedCx();
+}
+
+double wxSVGRadialGradientElement::GetQualifiedFy() const {
+	return m_fy.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_fy.GetAnimVal().GetValue() : GetQualifiedCy();
+}

wxsvg-1.1.5.tar.bz2/src/SVGStylable.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGStylable.cpp Changed

wxsvg-1.1.5.tar.bz2/src/agg/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/agg/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -100,8 +100,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -121,6 +119,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -168,6 +168,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -269,7 +272,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwxsvg_agg.la: $(libwxsvg_agg_la_OBJECTS) $(libwxsvg_agg_la_DEPENDENCIES) 
+libwxsvg_agg.la: $(libwxsvg_agg_la_OBJECTS) $(libwxsvg_agg_la_DEPENDENCIES) $(EXTRA_libwxsvg_agg_la_DEPENDENCIES) 
 	$(CXXLINK)  $(libwxsvg_agg_la_OBJECTS) $(libwxsvg_agg_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -405,10 +408,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/src/cairo/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/cairo/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -97,8 +97,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -118,6 +116,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -165,6 +165,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -267,7 +270,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwxsvg_cairo.la: $(libwxsvg_cairo_la_OBJECTS) $(libwxsvg_cairo_la_DEPENDENCIES) 
+libwxsvg_cairo.la: $(libwxsvg_cairo_la_OBJECTS) $(libwxsvg_cairo_la_DEPENDENCIES) $(EXTRA_libwxsvg_cairo_la_DEPENDENCIES) 
 	$(CXXLINK)  $(libwxsvg_cairo_la_OBJECTS) $(libwxsvg_cairo_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -404,10 +407,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/src/cairo/SVGCanvasCairo.cpp -> wxsvg-1.1.9.tar.bz2/src/cairo/SVGCanvasCairo.cpp Changed

@@ -3,7 +3,7 @@
 // Purpose:     Cairo render
 // Author:      Alex Thuering
 // Created:     2005/05/12
-// RCS-ID:      $Id: SVGCanvasCairo.cpp,v 1.17 2011/11/22 21:09:42 ntalex Exp $
+// RCS-ID:      $Id: SVGCanvasCairo.cpp,v 1.22 2012/04/09 12:17:00 ntalex Exp $
 // Copyright:   (c) 2005 Alex Thuering
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
@@ -147,11 +147,11 @@
 			}
 			case wxSVG_RADIALGRADIENT_ELEMENT: {
 				wxSVGRadialGradientElement* radialGradElem = (wxSVGRadialGradientElement*) gradElem;
-				double r = radialGradElem->GetR().GetAnimVal();
-				double cx = radialGradElem->GetCx().GetAnimVal();
-				double cy = radialGradElem->GetCy().GetAnimVal();
-				double fx = radialGradElem->GetFx().GetAnimVal();
-				double fy = radialGradElem->GetFy().GetAnimVal();
+				double r = radialGradElem->GetQualifiedR();
+				double cx = radialGradElem->GetQualifiedCx();
+				double cy = radialGradElem->GetQualifiedCy();
+				double fx = radialGradElem->GetQualifiedFx();
+				double fy = radialGradElem->GetQualifiedFy();
 				
 				if (gradElem->GetGradientUnits().GetAnimVal() == wxSVG_UNIT_TYPE_UNKNOWN
 						|| gradElem->GetGradientUnits().GetAnimVal() == wxSVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
@@ -162,7 +162,17 @@
 					fx = bbox.GetX() + fx * bbox.GetWidth();
 					fy = bbox.GetY() + fy * bbox.GetHeight();
 				}
-				m_pattern = cairo_pattern_create_radial(fx, fy, 0.0, cx, cy, r); 
+				m_pattern = cairo_pattern_create_radial(fx, fy, 0.0, cx, cy, r);
+				const wxSVGTransformList& transforms =  gradElem->GetGradientTransform().GetAnimVal();
+				if (transforms.GetCount() > 0) {
+					wxSVGMatrix matrix;
+					for (unsigned int i = 0; i < transforms.GetCount(); i++)
+						matrix = matrix.Multiply(transformsi.GetMatrix());
+					matrix = matrix.Inverse();
+					cairo_matrix_t mat;
+					cairo_matrix_init(&mat, matrix.GetA(), matrix.GetB(), matrix.GetC(), matrix.GetD(), matrix.GetE(), matrix.GetF());
+					cairo_pattern_set_matrix(m_pattern, &mat);
+				}
 				break;
 			}
 			default:
@@ -373,7 +383,7 @@
 	// check Filter
 	if (style.GetFilter().GetCSSPrimitiveType() == wxCSS_URI && style.GetFilter().GetStringValue().length() > 1) {
 		wxString filterId = style.GetFilter().GetStringValue().substr(1);
-		wxSVGElement* filterElem = (wxSVGSVGElement*) svgElem.GetElementById(filterId);
+		wxSVGElement* filterElem = (wxSVGElement*) svgElem.GetElementById(filterId);
 		// feGaussianBlur
 		if (filterElem && filterElem->GetDtd() == wxSVG_FILTER_ELEMENT && filterElem->GetFirstChild() != NULL
 				&& ((wxSVGSVGElement*) filterElem->GetFirstChild())->GetDtd() == wxSVG_FEGAUSSIANBLUR_ELEMENT) {
@@ -409,6 +419,8 @@
 			cairo_paint(m_cr); // fill the rectangle using the pattern
 			cairo_new_path(m_cr);
 			cairo_restore(m_cr);
+			
+			cairo_pattern_destroy(pattern);
 			cairo_destroy(cr);
 			cairo_surface_destroy(surface);
 			return;
@@ -428,6 +440,57 @@
 	cairo_matrix_init(&mat, matrix.GetA(), matrix.GetB(), matrix.GetC(), matrix.GetD(), matrix.GetE(), matrix.GetF());
 	cairo_set_matrix(m_cr, &mat);
 	
+	// ClipPath
+	if (style.GetClipPath().GetCSSPrimitiveType() == wxCSS_URI && style.GetClipPath().GetStringValue().length() > 1) {
+		wxString clipPathId = style.GetClipPath().GetStringValue().substr(1);
+		wxSVGElement* clipPathElem = (wxSVGElement*) svgElem.GetElementById(clipPathId);
+		if (clipPathElem && clipPathElem->GetDtd() == wxSVG_CLIPPATH_ELEMENT) {
+			wxSVGElement* elem = (wxSVGElement*) clipPathElem->GetFirstChild();
+			while (elem != NULL) {
+				if (elem->GetOwnerSVGElement() == NULL)
+					elem->SetOwnerSVGElement(&svgElem);
+				if (elem->GetViewportElement() == NULL)
+					elem->SetViewportElement(&svgElem);
+				wxSVGDocument* doc = (wxSVGDocument*) elem->GetOwnerDocument();
+				wxSVGCanvasItem* canvasItem = NULL;
+				switch (elem->GetDtd()) {
+				case wxSVG_LINE_ELEMENT:
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGLineElement*) elem);
+					break;
+				case wxSVG_POLYLINE_ELEMENT:
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGPolylineElement*) elem);
+					break;
+				case wxSVG_POLYGON_ELEMENT:
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGPolygonElement*) elem);
+					break;
+				case wxSVG_RECT_ELEMENT:
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGRectElement*) elem);
+					break;
+				case wxSVG_CIRCLE_ELEMENT:
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGCircleElement*) elem);
+					break;
+				case wxSVG_ELLIPSE_ELEMENT: {
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGEllipseElement*) elem);
+					break;
+				}
+				case wxSVG_PATH_ELEMENT:
+					canvasItem = doc->GetCanvas()->CreateItem((wxSVGPathElement*) elem);
+					break;
+				default:
+					break;
+				}
+				if (canvasItem != NULL) {
+					cairo_path_t* path = ((wxSVGCanvasPathCairo*) canvasItem)->GetPath();
+					cairo_append_path(m_cr, path);
+					cairo_clip(m_cr);
+					//cairo_path_destroy(path);
+					delete canvasItem;
+				}
+				elem = (wxSVGElement*) elem->GetNextSibling();
+			}
+		}
+	}
+	
 	// scale context
 	double x = canvasImage.m_x;
 	double y = canvasImage.m_y;
@@ -436,6 +499,7 @@
 	wxSVG_PRESERVEASPECTRATIO align = canvasImage.GetPreserveAspectRatio().GetAlign();
 	bool alignX = false;
 	if (align > wxSVG_PRESERVEASPECTRATIO_NONE) {
+		scaleY = canvasImage.m_height / canvasImage.GetDefaultHeight();
 		if (canvasImage.GetPreserveAspectRatio().GetMeetOrSlice() != wxSVG_MEETORSLICE_SLICE) {
 			alignX = scaleX > scaleY;
 		} else {
@@ -448,22 +512,23 @@
 			if (align == wxSVG_PRESERVEASPECTRATIO_XMIDYMIN
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMIDYMID
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMIDYMAX)
-				x += (canvasImage.m_width - canvasImage.m_image.GetWidth() * scaleX) / 2;
+				x += (canvasImage.m_width - canvasImage.GetDefaultWidth() * scaleX) / 2;
 			else if (align == wxSVG_PRESERVEASPECTRATIO_XMAXYMIN
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMAXYMID
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMAXYMAX)
-				x += canvasImage.m_width - canvasImage.m_image.GetWidth() * scaleX;
+				x += canvasImage.m_width - canvasImage.GetDefaultWidth() * scaleX;
 		} else {
 			scaleY = scaleX;
 			if (align == wxSVG_PRESERVEASPECTRATIO_XMINYMID
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMIDYMID
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMAXYMID)
-				y += (canvasImage.m_height - canvasImage.m_image.GetHeight() * scaleY) / 2;
+				y += (canvasImage.m_height - canvasImage.GetDefaultHeight() * scaleY) / 2;
 			else if (align == wxSVG_PRESERVEASPECTRATIO_XMINYMAX
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMIDYMAX
 					|| align == wxSVG_PRESERVEASPECTRATIO_XMAXYMAX)
-				y += canvasImage.m_height - canvasImage.m_image.GetHeight() * scaleY;
+				y += canvasImage.m_height - canvasImage.GetDefaultHeight() * scaleY;
 		}
+		scaleY = scaleY * canvasImage.GetDefaultHeight() / canvasImage.m_image.GetHeight();
 	}
 	cairo_translate(m_cr, x, y);
 	cairo_scale(m_cr, scaleX, scaleY);

wxsvg-1.1.5.tar.bz2/src/cairo/SVGCanvasPathCairo.cpp -> wxsvg-1.1.9.tar.bz2/src/cairo/SVGCanvasPathCairo.cpp Changed

wxsvg-1.1.5.tar.bz2/src/cairo/SVGCanvasTextCairo.cpp -> wxsvg-1.1.9.tar.bz2/src/cairo/SVGCanvasTextCairo.cpp Changed

@@ -3,7 +3,7 @@
 // Purpose:     Cairo canvas text
 // Author:      Alex Thuering
 // Created:     2011/06/23
-// RCS-ID:      $Id: SVGCanvasTextCairo.cpp,v 1.6 2011/08/04 20:58:33 ntalex Exp $
+// RCS-ID:      $Id: SVGCanvasTextCairo.cpp,v 1.8 2012/01/21 15:06:50 ntalex Exp $
 // Copyright:   (c) 2011 Alex Thuering
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
@@ -14,8 +14,10 @@
 #include <wx/font.h>
 #include <wx/tokenzr.h>
 #include <cairo/cairo.h>
-#ifdef __WXMSW__
+#if defined(__WXMSW__)
 #include <cairo/cairo-win32.h>
+#elif defined(__WXMAC__) 
+#include <cairo/cairo-quartz.h>
 #else
 #include <pango/pangocairo.h>
 #endif
@@ -32,7 +34,7 @@
 	// create path from text
 	cairo_t* cr = ((wxSVGCanvasPathCairo*) m_char->path)->GetCr();
 	
-#ifdef __WXMSW__
+#if defined(__WXMSW__) || defined(__WXMAC__)
 	int size = (int) style.GetFontSize();
 	int fstyle = style.GetFontStyle() == wxCSS_VALUE_ITALIC ? wxFONTSTYLE_ITALIC
 			: (style.GetFontStyle() == wxCSS_VALUE_OBLIQUE ? wxFONTSTYLE_SLANT : wxFONTSTYLE_NORMAL);
@@ -40,9 +42,13 @@
 			: style.GetFontWeight() == wxCSS_VALUE_BOLDER ? wxFONTWEIGHT_MAX
 			: style.GetFontWeight() == wxCSS_VALUE_LIGHTER ? wxFONTWEIGHT_LIGHT : wxFONTWEIGHT_NORMAL;
 	wxFont fnt(size, wxFONTFAMILY_DEFAULT, fstyle, weight, false, style.GetFontFamily());
+#ifdef __WXMSW__
 	HFONT hfont = (HFONT) fnt.GetResourceHandle();
-	
 	cairo_set_font_face(cr, cairo_win32_font_face_create_for_hfont(hfont));
+#else
+	wxUint32 atsuFontId = fnt.MacGetATSUFontID();
+	cairo_set_font_face(cr, cairo_quartz_font_face_create_for_atsu_font_id(atsuFontId));
+#endif	
 	cairo_set_font_size(cr, style.GetFontSize());
 	
 	cairo_font_extents_t fextents;

wxsvg-1.1.5.tar.bz2/src/freetype/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/freetype/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -96,8 +96,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -117,6 +115,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -164,6 +164,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -266,7 +269,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwxsvg_freetype.la: $(libwxsvg_freetype_la_OBJECTS) $(libwxsvg_freetype_la_DEPENDENCIES) 
+libwxsvg_freetype.la: $(libwxsvg_freetype_la_OBJECTS) $(libwxsvg_freetype_la_DEPENDENCIES) $(EXTRA_libwxsvg_freetype_la_DEPENDENCIES) 
 	$(CXXLINK)  $(libwxsvg_freetype_la_OBJECTS) $(libwxsvg_freetype_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -400,10 +403,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/src/imagsvg.cpp -> wxsvg-1.1.9.tar.bz2/src/imagsvg.cpp Changed

wxsvg-1.1.5.tar.bz2/src/libart/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/libart/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -97,8 +97,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -118,6 +116,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -165,6 +165,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -267,7 +270,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwxsvg_libart.la: $(libwxsvg_libart_la_OBJECTS) $(libwxsvg_libart_la_DEPENDENCIES) 
+libwxsvg_libart.la: $(libwxsvg_libart_la_OBJECTS) $(libwxsvg_libart_la_DEPENDENCIES) $(EXTRA_libwxsvg_libart_la_DEPENDENCIES) 
 	$(CXXLINK)  $(libwxsvg_libart_la_OBJECTS) $(libwxsvg_libart_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -402,10 +405,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/src/mediadec_ffmpeg.cpp -> wxsvg-1.1.9.tar.bz2/src/mediadec_ffmpeg.cpp Changed

@@ -3,34 +3,23 @@
 // Purpose:     FFMPEG Media Decoder
 // Author:      Alex Thuering
 // Created:     21.07.2007
-// RCS-ID:      $Id: mediadec_ffmpeg.cpp,v 1.15 2011/08/02 06:48:14 ntalex Exp $
+// RCS-ID:      $Id: mediadec_ffmpeg.cpp,v 1.22 2012/06/24 22:35:42 ntalex Exp $
 // Copyright:   (c) Alex Thuering
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#define __STDC_CONSTANT_MACROS
+#define __STDC_LIMIT_MACROS
+
 #include <wxSVG/mediadec_ffmpeg.h>
 #include <wx/wx.h>
 #include <errno.h>
 
-#define INT64_C(val) val##LL
-#define UINT64_C(val) val##ULL
-#ifndef int64_t_C
-#define int64_t_C(c)     (c ## LL)
-#define uint64_t_C(c)    (c ## ULL)
-#endif
-#ifndef INT64_MAX
-#define INT64_MAX int64_t_C(0x7fffffffffffffff)
-#endif
 extern "C" {
-#define __STDC_CONSTANT_MACROS
-#define __STDC_LIMIT_MACROS
-#ifdef HAVE_FFMPEG_AVUTIL_H
-#include <avformat.h>
-#include <swscale.h>
-#else
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
-#endif
+#include <libavutil/avutil.h>
+#include <libavutil/mathematics.h>
 }
 
 wxFfmpegMediaDecoder::wxFfmpegMediaDecoder(): m_formatCtx(NULL), m_codecCtx(NULL), m_frame(NULL) {
@@ -57,17 +46,19 @@
 
 bool wxFfmpegMediaDecoder::Load(const wxString& fileName) {
 	Close();
-	if (!wxFileExists(fileName)) {
+	if ((fileName.Find(wxT(':')) <= 0 || fileName.Find(wxT(':')) >= 8
+			|| fileName.GetChar(fileName.Find(wxT(':')) - 1) == wxT('\\'))
+			&& !wxFileExists(fileName)) {
 		wxLogError(wxT("%s: no such file or directory"), fileName.c_str());
 		return false;
 	}
-	int err = av_open_input_file(&m_formatCtx, fileName.mb_str(), NULL, 0, NULL);
+	int err = avformat_open_input(&m_formatCtx, fileName.mb_str(), NULL, NULL);
 	if (err != 0) {
 		PrintError(fileName, err);
 		return false;
 	}
 	// Retrieve stream information
-	if (av_find_stream_info(m_formatCtx)<0) {
+	if (avformat_find_stream_info(m_formatCtx, NULL) < 0) {
 		wxLogError(wxT("%s: could not find codec parameters"), fileName.c_str());
 		return false;
 	}
@@ -77,8 +68,7 @@
 void wxFfmpegMediaDecoder::Close() {
 	EndDecode();
 	if (m_formatCtx)
-		av_close_input_file(m_formatCtx);
-	m_formatCtx = NULL;
+		avformat_close_input(&m_formatCtx);
 }
 
 unsigned int wxFfmpegMediaDecoder::GetStreamCount() {
@@ -160,10 +150,9 @@
 	return m_formatCtx ? m_formatCtx->streamsstreamIndex->codec->bit_rate : -1;
 }
 
-double wxFfmpegMediaDecoder::GetDuration()
-{
-    return m_formatCtx != NULL && m_formatCtx->duration != (int)AV_NOPTS_VALUE ?
-      m_formatCtx->duration / AV_TIME_BASE : -1;
+double wxFfmpegMediaDecoder::GetDuration() {
+	return m_formatCtx != NULL && m_formatCtx->duration != (int)AV_NOPTS_VALUE ?
+			((double)m_formatCtx->duration) / AV_TIME_BASE : -1;
 }
 
 bool wxFfmpegMediaDecoder::OpenVideoDecoder() {
@@ -183,7 +172,7 @@
 	m_codecCtx = m_formatCtx->streamsm_videoStream->codec;
 	// find and open the decoder for the video stream 
 	AVCodec* codec = avcodec_find_decoder(m_codecCtx->codec_id);
-	if (!codec || avcodec_open(m_codecCtx, codec)<0) {
+	if (!codec || avcodec_open2(m_codecCtx, codec, NULL) < 0) {
 		m_codecCtx = NULL;
 		return false;
 	}

wxsvg-1.1.5.tar.bz2/src/svgctrl.cpp -> wxsvg-1.1.9.tar.bz2/src/svgctrl.cpp Changed

wxsvg-1.1.5.tar.bz2/src/svgxml/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/svgxml/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -95,8 +95,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -116,6 +114,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -163,6 +163,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -262,7 +265,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libwxsvgxml.la: $(libwxsvgxml_la_OBJECTS) $(libwxsvgxml_la_DEPENDENCIES) 
+libwxsvgxml.la: $(libwxsvgxml_la_OBJECTS) $(libwxsvgxml_la_DEPENDENCIES) $(EXTRA_libwxsvgxml_la_DEPENDENCIES) 
 	$(CXXLINK)  $(libwxsvgxml_la_OBJECTS) $(libwxsvgxml_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -397,10 +400,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/src/svgxml/svgxml.cpp -> wxsvg-1.1.9.tar.bz2/src/svgxml/svgxml.cpp Changed

@@ -3,7 +3,7 @@
 // Purpose:     wxSvgXmlDocument - XML parser & data holder class
 // Author:      Vaclav Slavik
 // Created:     2000/03/05
-// RCS-ID:      $Id: svgxml.cpp,v 1.4 2011/11/23 20:33:13 ntalex Exp $
+// RCS-ID:      $Id: svgxml.cpp,v 1.7 2012/04/09 12:20:07 ntalex Exp $
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -189,7 +189,8 @@
 
 void wxSvgXmlNode::InsertChild(wxSvgXmlNode *child, wxSvgXmlNode *before_node)
 {
-    wxASSERT_MSG(before_node->GetParent() == this, wxT("wxSvgXmlNode::InsertChild - the node has incorrect parent"));
+    wxASSERT_MSG(before_node == NULL || before_node->GetParent() == this,
+    		wxT("wxSvgXmlNode::InsertChild - the node has incorrect parent"));
 
     if (m_children == before_node)
        m_children = child;
@@ -313,66 +314,50 @@
     }
 }
 
-wxString wxSvgXmlNode::GetAttribute(const wxString& name)
-{
-  wxString val;
-  GetPropVal(name, &val);
-  return val;
+wxString wxSvgXmlNode::GetAttribute(const wxString& name) {
+	wxString val;
+	GetPropVal(name, &val);
+	return val;
 }
 
-wxString wxSvgXmlNode::GetAttributeNS(const wxString& namespaceURI, 
-								   const wxString& localName)
-{
-  return GetAttribute(localName);
+wxString wxSvgXmlNode::GetAttributeNS(const wxString& namespaceURI, const wxString& localName) {
+	return GetAttribute(localName);
 }
 
-bool wxSvgXmlNode::SetAttribute(const wxString& name, const wxString& value)
-{
-  wxSvgXmlProperty *prop = GetProperties();
-  while (prop)
-  {
-	if (prop->GetName() == name)
-	{
-	  prop->SetValue(value);
-	  return true;
+bool wxSvgXmlNode::SetAttribute(const wxString& name, const wxString& value) {
+	wxSvgXmlProperty *prop = GetProperties();
+	while (prop) {
+		if (prop->GetName() == name) {
+			prop->SetValue(value);
+			return true;
+		}
+		prop = prop->GetNext();
 	}
-	prop = prop->GetNext();
-  }
-  AddProperty(name, value);
-  return true;
+	AddProperty(name, value);
+	return true;
 }
 
-bool wxSvgXmlNode::SetAttributeNS(const wxString& namespaceURI, 
-							   const wxString& qualifiedName, 
-							   const wxString& value)
-{
-  return SetAttribute(qualifiedName, value);
+bool wxSvgXmlNode::SetAttributeNS(const wxString& namespaceURI, const wxString& qualifiedName, const wxString& value) {
+	return SetAttribute(qualifiedName, value);
 }
 
-void wxSvgXmlNode::RemoveAttribute(const wxString& name)
-{
-  DeleteProperty(name);
+void wxSvgXmlNode::RemoveAttribute(const wxString& name) {
+	DeleteProperty(name);
 }
 
-void wxSvgXmlNode::RemoveAttributeNS(const wxString& namespaceURI, 
-								  const wxString& localName)
-{
-  RemoveAttribute(localName);
+void wxSvgXmlNode::RemoveAttributeNS(const wxString& namespaceURI, const wxString& localName) {
+	RemoveAttribute(localName);
 }
 
-bool wxSvgXmlNode::HasAttribute(const wxString& name)
-{
+bool wxSvgXmlNode::HasAttribute(const wxString& name) {
   return HasProp(name);
 }
 
-bool wxSvgXmlNode::HasAttributeNS(const wxString& namespaceURI, 
-							   const wxString& localName)
-{
+bool wxSvgXmlNode::HasAttributeNS(const wxString& namespaceURI, const wxString& localName) {
   return HasAttribute(localName);
 }
 
-wxSvgXmlAttrHash wxSvgXmlNode::GetAttributes() const
-{
+wxSvgXmlAttrHash wxSvgXmlNode::GetAttributes() const {
   wxSvgXmlAttrHash attributes;
   wxSvgXmlProperty *prop = GetProperties();
   while (prop)
@@ -454,8 +439,11 @@
     m_root = new wxSvgXmlNode(*doc.m_root);
 }
 
-bool wxSvgXmlDocument::Load(const wxString& filename, const wxString& encoding)
-{
+bool wxSvgXmlDocument::Load(const wxString& filename, const wxString& encoding) {
+	if (!wxFile::Exists(filename)) {
+		wxLogError(_("File %s doesn't exist."), filename.c_str());
+		return false;
+	}
     wxFileInputStream stream(filename);
     return Load(stream, encoding);
 }
@@ -804,13 +792,9 @@
             OutputString(stream, node->GetName(), NULL, NULL);
 
             attributes = node->GetAttributes();
-            for (wxSvgXmlAttrHash::iterator it = attributes.begin();
-                 it != attributes.end(); ++it)
-            {
-                OutputString(stream, wxT(" ") + it->first +  wxT("=\""),
-                             NULL, NULL);
-                OutputStringEnt(stream, it->second, NULL, NULL,
-                                true/*escapeQuotes*/);
+            for (wxSvgXmlAttrHash::iterator it = attributes.begin(); it != attributes.end(); ++it) {
+                OutputString(stream, wxT(" ") + it->GetName() +  wxT("=\""), NULL, NULL);
+                OutputStringEnt(stream, it->GetValue(), NULL, NULL, true/*escapeQuotes*/);
                 OutputString(stream, wxT("\""), NULL, NULL);
             }

wxsvg-1.1.5.tar.bz2/svgview/Makefile.in -> wxsvg-1.1.9.tar.bz2/svgview/Makefile.in Changed

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
@@ -97,8 +97,6 @@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-FFMPEG_LIBS = @FFMPEG_LIBS@
 FGREP = @FGREP@
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
@@ -118,6 +116,8 @@
 LIBART_CFLAGS = @LIBART_CFLAGS@
 LIBART_CONFIG = @LIBART_CONFIG@
 LIBART_LIBS = @LIBART_LIBS@
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
+LIBAV_LIBS = @LIBAV_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBRARY_VERSION = @LIBRARY_VERSION@
 LIBS = @LIBS@
@@ -165,6 +165,9 @@
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
 WX_RESCOMP = @WX_RESCOMP@
 WX_VERSION = @WX_VERSION@
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -298,7 +301,7 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-svgview$(EXEEXT): $(svgview_OBJECTS) $(svgview_DEPENDENCIES) 
+svgview$(EXEEXT): $(svgview_OBJECTS) $(svgview_DEPENDENCIES) $(EXTRA_svgview_DEPENDENCIES) 
 	@rm -f svgview$(EXEEXT)
 	$(CXXLINK) $(svgview_OBJECTS) $(svgview_LDADD) $(LIBS)
 
@@ -436,10 +439,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	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:

wxsvg-1.1.5.tar.bz2/svgview/gradients.svg -> wxsvg-1.1.9.tar.bz2/svgview/gradients.svg Changed

wxsvg-1.1.5.tar.bz2/svgview/svgview.cpp -> wxsvg-1.1.9.tar.bz2/svgview/svgview.cpp Changed

@@ -3,7 +3,7 @@
 // Purpose:     
 // Author:      Alex Thuering
 // Created:     15/01/2005
-// RCS-ID:      $Id: svgview.cpp,v 1.12 2011/10/31 18:48:13 ntalex Exp $
+// RCS-ID:      $Id: svgview.cpp,v 1.14 2012/04/01 20:37:00 ntalex Exp $
 // Copyright:   (c) Alex Thuering
 // Licence:     wxWindows licence
 //////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@
 
 #include "svgview.h"
 #include <wxSVG/svg.h>
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
 #include <wxSVG/mediadec_ffmpeg.h>
 #endif
 
@@ -47,7 +47,7 @@
 #endif
   //wxLog::SetActiveTarget(new wxLogStderr);
   wxInitAllImageHandlers();
-#ifdef USE_FFMPEG
+#ifdef USE_LIBAV
   wxFfmpegMediaDecoder::Init();
 #endif
   
@@ -82,10 +82,10 @@
 		wxFrame(parent, wxID_ANY, title, pos, size, style) {
     // Make a menubar
     wxMenu *fileMenu = new wxMenu;
-    fileMenu->Append(wxID_OPEN, _T("&Open..."));
-    fileMenu->Append(wxID_SAVE, _T("&Save as..."));
+    fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O"));
+    fileMenu->Append(wxID_SAVE, _T("&Save as...\tCtrl-S"));
     fileMenu->AppendSeparator();
-    fileMenu->Append(wxID_EXIT, _T("&Close"));
+    fileMenu->Append(wxID_EXIT, _T("&Exit\tAlt-X"));
     fileMenu->AppendSeparator();
     fileMenu->AppendCheckItem(wxID_FIT, _T("&FitToFrame"))->Check();
     fileMenu->AppendCheckItem(wxID_HITTEST, _T("&Hit-Test"));

wxsvg-1.1.5.tar.bz2/wxwin.m4 -> wxsvg-1.1.9.tar.bz2/wxwin.m4 Changed

@@ -4,10 +4,10 @@
 dnl     AC_ARG_ENABLE(...)
 dnl     AC_ARG_WITH(...)
 dnl        ...
-dnl     AM_OPTIONS_WXCONFIG
+dnl     WX_CONFIG_OPTIONS
 dnl        ...
 dnl        ...
-dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
+dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
 dnl     if test "$wxWin" != 1; then
 dnl        AC_MSG_ERROR(
 dnl                wxWidgets must be installed on your system
@@ -24,16 +24,46 @@
 dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
 dnl
 dnl     LIBS="$LIBS $WX_LIBS"
+dnl
+dnl If you want to support standard --enable-debug/unicode/shared options, you
+dnl may do the following:
+dnl
+dnl     ...
+dnl     AC_CANONICAL_SYSTEM
+dnl
+dnl     # define configure options
+dnl     WX_CONFIG_OPTIONS
+dnl     WX_STANDARD_OPTIONS(debug,unicode,shared,toolkit,wxshared)
+dnl
+dnl     # basic configure checks
+dnl     ...
+dnl
+dnl     # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
+dnl     WX_DEBUG=$DEBUG
+dnl     WX_UNICODE=$UNICODE
+dnl
+dnl     WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl     WX_CONFIG_CHECK(2.8.0, wxWin=1,,html,core,net,base,$WXCONFIG_FLAGS)
+dnl     WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl     # write the output files
+dnl     AC_CONFIG_FILES(Makefile ...)
+dnl     AC_OUTPUT
+dnl
+dnl     # optional: just to show a message to the user
+dnl     WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
 dnl ---------------------------------------------------------------------------
 
+
 dnl ---------------------------------------------------------------------------
-dnl AM_OPTIONS_WXCONFIG
+dnl WX_CONFIG_OPTIONS
 dnl
 dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
 dnl --wx-config command line options
 dnl ---------------------------------------------------------------------------
 
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
+AC_DEFUN(WX_CONFIG_OPTIONS,
 
     AC_ARG_WITH(wxdir,
                   --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH,
@@ -76,7 +106,7 @@
 )
 
 dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXCONFIG(VERSION, ACTION-IF-FOUND , ACTION-IF-NOT-FOUND
+dnl WX_CONFIG_CHECK(VERSION, ACTION-IF-FOUND , ACTION-IF-NOT-FOUND
 dnl                  , WX-LIBS , ADDITIONAL-WX-CONFIG-FLAGS)
 dnl
 dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
@@ -86,23 +116,23 @@
 dnl case the macro won't even waste time on tests for its existence.
 dnl
 dnl Optional WX-LIBS argument contains comma- or space-separated list of
-dnl wxWidgets libraries to link against (it may include contrib libraries). If
-dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
-dnl link with all of the core wxWidgets libraries.
+dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
+dnl and WX_LIBS_STATIC will contain flags to link with all of the core
+dnl wxWidgets libraries.
 dnl
 dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
 dnl invocation command in present. It can be used to fine-tune lookup of
 dnl best wxWidgets build available.
 dnl
 dnl Example use:
-dnl   AM_PATH_WXCONFIG(2.6.0, wxWin=1, wxWin=0, html,core,net
+dnl   WX_CONFIG_CHECK(2.6.0, wxWin=1, wxWin=0, html,core,net
 dnl                    --unicode --debug)
 dnl ---------------------------------------------------------------------------
 
 dnl
 dnl Get the cflags and libraries from the wx-config script
 dnl
-AC_DEFUN(AM_PATH_WXCONFIG,
+AC_DEFUN(WX_CONFIG_CHECK,
 
   dnl do we have wx-config name: it can be wx-config or wxd-config or ...
   if test x${WX_CONFIG_NAME+set} != xset ; then
@@ -145,7 +175,9 @@
       AC_MSG_CHECKING(for wxWidgets version >= $min_wx_version ($5))
     fi
 
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
+    dnl don't add the libraries ($4) to this variable as this would result in
+    dnl an error when it's used with --version below
+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
 
     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
     wx_config_major_version=`echo $WX_VERSION | \
@@ -167,16 +199,15 @@
                               $wx_requested_micro_version)
 
     if test -n "$wx_ver_ok"; then
-
       AC_MSG_RESULT(yes (version $WX_VERSION))
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
 
       dnl is this even still appropriate?  --static is a real option now
       dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
       dnl what the user actually wants, making this redundant at best.
       dnl For now keep it in case anyone actually used it in the past.
       AC_MSG_CHECKING(for wxWidgets static library)
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
       if test "x$WX_LIBS_STATIC" = "x"; then
         AC_MSG_RESULT(no)
       else
@@ -221,7 +252,7 @@
 
       if test "x$wx_has_cppflags" = x ; then
          dnl no choice but to define all flags like CFLAGS
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
          WX_CPPFLAGS=$WX_CFLAGS
          WX_CXXFLAGS=$WX_CFLAGS
 
@@ -229,9 +260,9 @@
          WX_CXXFLAGS_ONLY=$WX_CFLAGS
       else
          dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
-         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
+         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
 
          WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
          WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
@@ -254,7 +285,32 @@
        WX_LIBS=""
        WX_LIBS_STATIC=""
        WX_RESCOMP=""
-       ifelse($3, , :, $3)
+
+       if test ! -z "$5"; then
+
+          wx_error_message="
+    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
+    build with the following settings:
+        $5
+    but such build is not available.
+
+    To see the wxWidgets builds available on this system, please use
+    'wx-config --list' command. To use the default build, returned by
+    'wx-config --selected-config', use the options with their 'auto'
+    default values."
+
+       fi
+
+       wx_error_message="
+    The requested wxWidgets build couldn't be found.
+    $wx_error_message
+
+    If you still get this error, then check that 'wx-config' is
+    in path, the directory where wxWidgets libraries are installed
+    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
+    or equivalent variable and wxWidgets version is $1 or above."
+
+       ifelse($3, , AC_MSG_ERROR($wx_error_message), $3)
 
     fi
   else
@@ -279,6 +335,15 @@
   AC_SUBST(WX_LIBS_STATIC)
   AC_SUBST(WX_VERSION)
   AC_SUBST(WX_RESCOMP)
+
+  dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
+  dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
+  WX_VERSION_MAJOR="$wx_config_major_version"
+  WX_VERSION_MINOR="$wx_config_minor_version"
+  WX_VERSION_MICRO="$wx_config_micro_version"
+  AC_SUBST(WX_VERSION_MAJOR)
+  AC_SUBST(WX_VERSION_MINOR)
+  AC_SUBST(WX_VERSION_MICRO)
 )
 
 dnl ---------------------------------------------------------------------------
@@ -288,9 +353,9 @@
 dnl     AC_ARG_ENABLE(...)
 dnl     AC_ARG_WITH(...)
 dnl        ...
-dnl     AM_OPTIONS_WXCONFIG
+dnl     WX_CONFIG_OPTIONS
 dnl        ...
-dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
+dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
 dnl     if test "$wxWin" != 1; then
 dnl        AC_MSG_ERROR(
 dnl                wxWidgets must be installed on your system
@@ -303,11 +368,11 @@
 dnl        )
 dnl     fi
 dnl
-dnl     AM_PATH_WXRC(HAVE_WXRC=1, HAVE_WXRC=0)
+dnl     WXRC_CHECK(HAVE_WXRC=1, HAVE_WXRC=0)
 dnl     if test "x$HAVE_WXRC" != x1; then
 dnl         AC_MSG_ERROR(
 dnl                The wxrc program was not installed or not found.
-dnl     
+dnl
 dnl                Please check the wxWidgets installation.
 dnl         )
 dnl     fi
@@ -319,32 +384,30 @@
 dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
 dnl ---------------------------------------------------------------------------
 
-
-
 dnl ---------------------------------------------------------------------------
-dnl AM_PATH_WXRC(ACTION-IF-FOUND , ACTION-IF-NOT-FOUND)
+dnl WXRC_CHECK(ACTION-IF-FOUND , ACTION-IF-NOT-FOUND)
 dnl
 dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
 dnl resources.  The variable WXRC will be set and substituted in the configure
 dnl script and Makefiles.
 dnl
 dnl Example use:
-dnl   AM_PATH_WXRC(wxrc=1, wxrc=0)
+dnl   WXRC_CHECK(wxrc=1, wxrc=0)
 dnl ---------------------------------------------------------------------------
 
 dnl
 dnl wxrc program from the wx-config script
 dnl
-AC_DEFUN(AM_PATH_WXRC,
+AC_DEFUN(WXRC_CHECK,
 
   AC_ARG_VAR(WXRC, Path to wxWidget's wxrc resource compiler)
-    
+
   if test "x$WX_CONFIG_NAME" = x; then
     AC_MSG_ERROR(The wxrc tests must run after wxWidgets test.)
   else
-    
+
     AC_MSG_CHECKING(for wxrc)
-    
+
     if test "x$WXRC" = x ; then
       dnl wx-config --utility is a new addition to wxWidgets:
       _WX_PRIVATE_CHECK_VERSION(2,5,3)
@@ -360,7 +423,604 @@
       AC_MSG_RESULT($WXRC)
       ifelse($1, , :, $1)
     fi
-    
+
     AC_SUBST(WXRC)
   fi
 )
+
+dnl ---------------------------------------------------------------------------
+dnl WX_LIKE_LIBNAME(output-var prefix, name)
+dnl
+dnl Sets the "output-var" variable to the name of a library named with same
+dnl wxWidgets rule.
+dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
+dnl      the $lib variable to:
+dnl          'mine_gtk2ud_test-2.8'
+dnl      if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_LIKE_LIBNAME,
+    
+        wx_temp="$2""_""$WX_PORT"
+
+        dnl add the ud string
+        if test "$WX_UNICODE" = "1"; then
+            wx_temp="$wx_temp""u"
+        fi
+        if test "$WX_DEBUG" = "1"; then
+            wx_temp="$wx_temp""d"
+        fi
+
+        dnl complete the name of the lib
+        wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
+
+        dnl save it in the user's variable
+        $1=$wx_temp
+    )
+
+dnl ---------------------------------------------------------------------------
+dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO
+dnl
+dnl Two little custom macros which define the ENABLE/WITH configure arguments.
+dnl Macro arguments:
+dnl $1 = the name of the --enable / --with  feature
+dnl $2 = the name of the variable associated
+dnl $3 = the description of that feature
+dnl $4 = the default value for that feature
+dnl $5 = additional action to do in case option is given with "yes" value
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_ARG_ENABLE_YESNOAUTO,
+         AC_ARG_ENABLE($1,
+            AC_HELP_STRING(--enable-$1, $3 (default is $4)),
+            , enableval="$4")
+
+            dnl Show a message to the user about this option
+            AC_MSG_CHECKING(for the --enable-$1 option)
+            if test "$enableval" = "yes" ; then
+                AC_MSG_RESULT(yes)
+                $2=1
+                $5
+            elif test "$enableval" = "no" ; then
+                AC_MSG_RESULT(no)
+                $2=0
+            elif test "$enableval" = "auto" ; then
+                AC_MSG_RESULT(will be automatically detected)
+                $2="auto"
+            else
+                AC_MSG_ERROR(
+    Unrecognized option value (allowed values: yes, no, auto)
+                )
+            fi
+         )
+
+AC_DEFUN(WX_ARG_WITH_YESNOAUTO,
+         AC_ARG_WITH($1,
+            AC_HELP_STRING(--with-$1, $3 (default is $4)),
+            , withval="$4")
+
+            dnl Show a message to the user about this option
+            AC_MSG_CHECKING(for the --with-$1 option)
+            if test "$withval" = "yes" ; then
+                AC_MSG_RESULT(yes)
+                $2=1
+                $5
+            dnl NB: by default we don't allow --with-$1=no option
+            dnl     since it does not make much sense !
+            elif test "$6" = "1" -a "$withval" = "no" ; then
+                AC_MSG_RESULT(no)
+                $2=0
+            elif test "$withval" = "auto" ; then
+                AC_MSG_RESULT(will be automatically detected)
+                $2="auto"
+            else
+                AC_MSG_ERROR(
+    Unrecognized option value (allowed values: yes, auto)
+                )
+            fi
+         )
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS(options-to-add)
+dnl
+dnl Adds to the configure script one or more of the following options:
+dnl   --enable-debug|unicode|shared|wxshared|wxdebug
+dnl   --with-gtk|msw|motif|x11|mac|mgl|dfb
+dnl   --with-wxversion
+dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
+dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
+dnl
+dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
+dnl --enable-unicode option (in boolean format) while the second indicates
+dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_STANDARD_OPTIONS,
+        
+
+        dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
+        dnl the $1 argument contains respectively the debug,unicode or shared options.
+
+        dnl be careful here not to set debug flag if only "wxdebug" was specified
+        ifelse(regexp($1, \bdebug), -1,,
+               WX_ARG_ENABLE_YESNOAUTO(debug, DEBUG, Build in debug mode, auto))
+
+        ifelse(index($1, unicode), -1,,
+               WX_ARG_ENABLE_YESNOAUTO(unicode, UNICODE, Build in Unicode mode, auto))
+
+        ifelse(regexp($1, \bshared), -1,,
+               WX_ARG_ENABLE_YESNOAUTO(shared, SHARED, Build as shared library, auto))
+
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
+        dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
+        ifelse(index($1, toolkit), -1,,
+               
+                AC_ARG_WITH(toolkit,
+                            AC_HELP_STRING(--with-toolkit,
+                                           Build against a specific wxWidgets toolkit (default is auto)),
+                            , withval="auto")
+
+                dnl Show a message to the user about this option
+                AC_MSG_CHECKING(for the --with-toolkit option)
+                if test "$withval" = "auto" ; then
+                    AC_MSG_RESULT(will be automatically detected)
+                    TOOLKIT="auto"
+                else
+                    TOOLKIT="$withval"
+
+                    dnl PORT must be one of the allowed values
+                    if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
+                            "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
+                            "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
+                            "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
+                        AC_MSG_ERROR(
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb)
+                        )
+                    fi
+
+                    AC_MSG_RESULT($TOOLKIT)
+                fi
+               )
+
+        dnl ****** IMPORTANT *******
+        dnl   Unlike for the UNICODE setting, you can build your program in
+        dnl   shared mode against a static build of wxWidgets. Thus we have the
+        dnl   following option which allows these mixtures. E.g.
+        dnl
+        dnl      ./configure --disable-shared --with-wxshared
+        dnl
+        dnl   will build your library in static mode against the first available
+        dnl   shared build of wxWidgets.
+        dnl
+        dnl   Note that's not possible to do the viceversa:
+        dnl
+        dnl      ./configure --enable-shared --without-wxshared
+        dnl
+        dnl   Doing so you would try to build your library in shared mode against a static
+        dnl   build of wxWidgets. This is not possible (you would mix PIC and non PIC code) !
+        dnl   A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES
+        dnl   (where we know what 'auto' should be expanded to).
+        dnl
+        dnl   If you try to build something in ANSI mode against a UNICODE build
+        dnl   of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets,
+        dnl   then at best you'll get ton of linking errors !
+        dnl ************************
+
+        ifelse(index($1, wxshared), -1,,
+               
+                WX_ARG_WITH_YESNOAUTO(
+                    wxshared, WX_SHARED,
+                    Force building against a shared build of wxWidgets, even if --disable-shared is given,
+                    auto, , 1)
+               )
+
+        dnl Just like for SHARED and WX_SHARED it may happen that some adventurous
+        dnl peoples will want to mix a wxWidgets release build with a debug build of
+        dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables.
+        ifelse(index($1, wxdebug), -1,,
+               
+                WX_ARG_WITH_YESNOAUTO(
+                    wxdebug, WX_DEBUG,
+                    Force building against a debug build of wxWidgets, even if --disable-debug is given,
+                    auto, , 1)
+               )
+
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
+        dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values
+        ifelse(index($1, wxversion), -1,,
+               
+                AC_ARG_WITH(wxversion,
+                            AC_HELP_STRING(--with-wxversion,
+                                           Build against a specific version of wxWidgets (default is auto)),
+                            , withval="auto")
+
+                dnl Show a message to the user about this option
+                AC_MSG_CHECKING(for the --with-wxversion option)
+                if test "$withval" = "auto" ; then
+                    AC_MSG_RESULT(will be automatically detected)
+                    WX_RELEASE="auto"
+                else
+
+                    wx_requested_major_version=`echo $withval | \
+                        sed 's/$0-9*$.$0-9*$.*/\1/'`
+                    wx_requested_minor_version=`echo $withval | \
+                        sed 's/$0-9*$.$0-9*$.*/\2/'`
+
+                    dnl both vars above must be exactly 1 digit
+                    if test "${#wx_requested_major_version}" != "1" -o \
+                            "${#wx_requested_minor_version}" != "1" ; then
+                        AC_MSG_ERROR(
+    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0)
+                        )
+                    fi
+
+                    WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version"
+                    AC_MSG_RESULT($WX_RELEASE)
+                fi
+               )
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "dbg DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
+            echo "dbg UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE"
+            echo "dbg SHARED: $SHARED, WX_SHARED: $WX_SHARED"
+            echo "dbg TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
+            echo "dbg VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
+        fi
+    )
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
+dnl
+dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values
+dnl which are different from "auto".
+dnl Thus this macro needs to be called only once all options have been set.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS,
+        
+        if test "$WX_SHARED" = "1" ; then
+            WXCONFIG_FLAGS="--static=no "
+        elif test "$WX_SHARED" = "0" ; then
+            WXCONFIG_FLAGS="--static=yes "
+        fi
+
+        if test "$WX_DEBUG" = "1" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes "
+        elif test "$WX_DEBUG" = "0" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
+        fi
+
+        dnl The user should have set WX_UNICODE=UNICODE
+        if test "$WX_UNICODE" = "1" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes "
+        elif test "$WX_UNICODE" = "0" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no "
+        fi
+
+        if test "$TOOLKIT" != "auto" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
+        fi
+
+        if test "$WX_RELEASE" != "auto" ; then
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE "
+        fi
+
+        dnl strip out the last space of the string
+        WXCONFIG_FLAGS=${WXCONFIG_FLAGS% }
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "dbg WXCONFIG_FLAGS: $WXCONFIG_FLAGS"
+        fi
+    )
+
+
+dnl ---------------------------------------------------------------------------
+dnl _WX_SELECTEDCONFIG_CHECKFOR(RESULTVAR, STRING, MSG
+dnl                             , ACTION-IF-FOUND , ACTION-IF-NOT-FOUND)
+dnl
+dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets
+dnl additional CPP flags and put the result of the search in WX_$RESULTVAR
+dnl also adding the "yes" or "no" message result to MSG.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(_WX_SELECTEDCONFIG_CHECKFOR,
+        
+        if test "$$1" = "auto" ; then
+
+            dnl The user does not have particular preferences for this option;
+            dnl so we will detect the wxWidgets relative build setting and use it
+            AC_MSG_CHECKING($3)
+
+            dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
+            dnl string or to 0 otherwise.
+            dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
+            dnl       doesn't work; we use 'expr STRING : REGEXP' instead
+            WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
+
+            if test "$WX_$1" != "0"; then
+                WX_$1=1
+                AC_MSG_RESULT(yes)
+                ifelse($4, , :, $4)
+            else
+                WX_$1=0
+                AC_MSG_RESULT(no)
+                ifelse($5, , :, $5)
+            fi
+        else
+
+            dnl Use the setting given by the user
+            WX_$1=$$1
+        fi
+    )
+
+dnl ---------------------------------------------------------------------------
+dnl WX_DETECT_STANDARD_OPTION_VALUES
+dnl
+dnl Detects the values of the following variables:
+dnl 1) WX_RELEASE
+dnl 2) WX_UNICODE
+dnl 3) WX_DEBUG
+dnl 4) WX_SHARED    (and also WX_STATIC)
+dnl 5) WX_PORT
+dnl from the previously selected wxWidgets build; this macro in fact must be
+dnl called *after* calling the WX_CONFIG_CHECK macro.
+dnl
+dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set
+dnl by WX_CONFIG_CHECK macro
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_DETECT_STANDARD_OPTION_VALUES,
+        
+        dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits,
+        dnl            while WX_RELEASE only the major.minor ones.
+        WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
+        if test $WX_RELEASE -lt 26 ; then
+
+            AC_MSG_ERROR(
+    Cannot detect the wxWidgets configuration for the selected wxWidgets build
+    since its version is $WX_VERSION < 2.6.0; please install a newer
+    version of wxWidgets.
+                         )
+        fi
+
+        dnl The wx-config we are using understands the "--selected_config"
+        dnl option which returns an easy-parseable string !
+        WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "dbg Using wx-config --selected-config"
+            echo "dbg WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG"
+        fi
+
+
+        dnl we could test directly for WX_SHARED with a line like:
+        dnl    _WX_SELECTEDCONFIG_CHECKFOR(SHARED, shared,
+        dnl                                if wxWidgets was built in SHARED mode)
+        dnl but wx-config --selected-config DOES NOT outputs the 'shared'
+        dnl word when wx was built in shared mode; it rather outputs the
+        dnl 'static' word when built in static mode.
+        if test $WX_SHARED = "1"; then
+            STATIC=0
+        elif test $WX_SHARED = "0"; then
+            STATIC=1
+        elif test $WX_SHARED = "auto"; then
+            STATIC="auto"
+        fi
+
+        dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
+        _WX_SELECTEDCONFIG_CHECKFOR(UNICODE, unicode,
+                                    if wxWidgets was built with UNICODE enabled)
+        _WX_SELECTEDCONFIG_CHECKFOR(DEBUG, debug,
+                                    if wxWidgets was built in DEBUG mode)
+        _WX_SELECTEDCONFIG_CHECKFOR(STATIC, static,
+                                    if wxWidgets was built in STATIC mode)
+
+        dnl init WX_SHARED from WX_STATIC
+        if test "$WX_STATIC" != "0"; then
+            WX_SHARED=0
+        else
+            WX_SHARED=1
+        fi
+
+        AC_SUBST(WX_UNICODE)
+        AC_SUBST(WX_DEBUG)
+        AC_SUBST(WX_SHARED)
+
+        dnl detect the WX_PORT to use
+        if test "$TOOLKIT" = "auto" ; then
+
+            dnl The user does not have particular preferences for this option;
+            dnl so we will detect the wxWidgets relative build setting and use it
+            AC_MSG_CHECKING(which wxWidgets toolkit was selected)
+
+            WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
+            WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
+            WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
+            WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
+            WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
+            WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
+            WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
+            WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
+
+            WX_PORT="unknown"
+            if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
+            if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
+            if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
+            if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
+            if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
+            if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
+            if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
+            if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
+
+            dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
+            dnl       ports are called 'osx_cocoa' and 'osx_carbon' (see above)
+            WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
+            if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
+
+            dnl check at least one of the WX_*PORT has been set !
+
+            if test "$WX_PORT" = "unknown" ; then
+                AC_MSG_ERROR(
+        Cannot detect the currently installed wxWidgets port !
+        Please check your 'wx-config --cxxflags'...
+                            )
+            fi
+
+            AC_MSG_RESULT($WX_PORT)
+        else
+
+            dnl Use the setting given by the user
+            if test -z "$TOOLKIT" ; then
+                WX_PORT=$TOOLKIT
+            else
+                dnl try with PORT
+                WX_PORT=$PORT
+            fi
+        fi
+
+        AC_SUBST(WX_PORT)
+
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
+            echo "dbg Values of all WX_* options after final detection:"
+            echo "dbg WX_DEBUG: $WX_DEBUG"
+            echo "dbg WX_UNICODE: $WX_UNICODE"
+            echo "dbg WX_SHARED: $WX_SHARED"
+            echo "dbg WX_RELEASE: $WX_RELEASE"
+            echo "dbg WX_PORT: $WX_PORT"
+        fi
+
+        dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when
+        dnl the user gives the options:
+        dnl      ./configure --enable-shared --without-wxshared
+        dnl or just do
+        dnl      ./configure --enable-shared
+        dnl but there is only a static build of wxWidgets available.
+        if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
+            AC_MSG_ERROR(
+    Cannot build shared library against a static build of wxWidgets !
+    This error happens because the wxWidgets build which was selected
+    has been detected as static while you asked to build $PACKAGE_NAME
+    as shared library and this is not possible.
+    Use the '--disable-shared' option to build $PACKAGE_NAME
+    as static library or '--with-wxshared' to use wxWidgets as shared library.
+                         )
+        fi
+
+        dnl now we can finally update the DEBUG,UNICODE,SHARED options
+        dnl to their final values if they were set to 'auto'
+        if test "$DEBUG" = "auto"; then
+            DEBUG=$WX_DEBUG
+        fi
+        if test "$UNICODE" = "auto"; then
+            UNICODE=$WX_UNICODE
+        fi
+        if test "$SHARED" = "auto"; then
+            SHARED=$WX_SHARED
+        fi
+        if test "$TOOLKIT" = "auto"; then
+            TOOLKIT=$WX_PORT
+        fi
+
+        dnl in case the user needs a BUILD=debug/release var...
+        if test "$DEBUG" = "1"; then
+            BUILD="debug"
+        elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then
+            BUILD="release"
+        fi
+
+        dnl respect the DEBUG variable adding the optimize/debug flags
+        dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
+        dnl       don't need to set them, too
+        if test "$DEBUG" = "1"; then
+            CXXFLAGS="$CXXFLAGS -g -O0"
+            CFLAGS="$CFLAGS -g -O0"
+        else
+            CXXFLAGS="$CXXFLAGS -O2"
+            CFLAGS="$CFLAGS -O2"
+        fi
+    )
+
+dnl ---------------------------------------------------------------------------
+dnl WX_BOOLOPT_SUMMARY(name of the boolean variable to show summary for,
+dnl                   what to print when var is 1,
+dnl                   what to print when var is 0)
+dnl
+dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0.
+dnl This macro mainly exists just to make configure.ac scripts more readable.
+dnl
+dnl NOTE: you need to use the " my message" syntax for 2nd and 3rd arguments
+dnl       if you want that m4 avoid to throw away the spaces prefixed to the
+dnl       argument value.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_BOOLOPT_SUMMARY,
+        
+        if test "x$$1" = "x1" ; then
+            echo $2
+        elif test "x$$1" = "x0" ; then
+            echo $3
+        else
+            echo "$1 is $$1"
+        fi
+    )
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
+dnl
+dnl Shows a summary message to the user about the WX_* variable contents.
+dnl This macro is used typically at the end of the configure script.
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_STANDARD_OPTIONS_SUMMARY_MSG,
+        
+        echo
+        echo "  The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
+        echo "  has the following settings:"
+        WX_BOOLOPT_SUMMARY(WX_DEBUG,   "  - DEBUG build",  "  - RELEASE build")
+        WX_BOOLOPT_SUMMARY(WX_UNICODE, "  - UNICODE mode", "  - ANSI mode")
+        WX_BOOLOPT_SUMMARY(WX_SHARED,  "  - SHARED mode",  "  - STATIC mode")
+        echo "  - VERSION: $WX_VERSION"
+        echo "  - PORT: $WX_PORT"
+    )
+
+
+dnl ---------------------------------------------------------------------------
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
+dnl about the configuration of the package which used the wxpresets.
+dnl
+dnl Typical usage:
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
+dnl    echo "   - Package setting 1: $SETTING1"
+dnl    echo "   - Package setting 2: $SETTING1"
+dnl    ...
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_END
+dnl
+dnl ---------------------------------------------------------------------------
+AC_DEFUN(WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN,
+        
+        echo
+        echo " ----------------------------------------------------------------"
+        echo "  Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
+        echo "  Summary of main configuration settings for $PACKAGE_NAME:"
+        WX_BOOLOPT_SUMMARY(DEBUG, "  - DEBUG build", "  - RELEASE build")
+        WX_BOOLOPT_SUMMARY(UNICODE, "  - UNICODE mode", "  - ANSI mode")
+        WX_BOOLOPT_SUMMARY(SHARED, "  - SHARED mode", "  - STATIC mode")
+    )
+
+AC_DEFUN(WX_STANDARD_OPTIONS_SUMMARY_MSG_END,
+        
+        WX_STANDARD_OPTIONS_SUMMARY_MSG
+        echo
+        echo "  Now, just run make."
+        echo " ----------------------------------------------------------------"
+        echo
+    )
+
+
+dnl ---------------------------------------------------------------------------
+dnl Deprecated macro wrappers
+dnl ---------------------------------------------------------------------------
+
+AC_DEFUN(AM_OPTIONS_WXCONFIG, WX_CONFIG_OPTIONS)
+AC_DEFUN(AM_PATH_WXCONFIG, 
+    WX_CONFIG_CHECK($1,$2,$3,$4,$5)
+)
+AC_DEFUN(AM_PATH_WXRC, WXRC_CHECK($1,$2))

Overview

Request 330 (accepted)

Request History