Overview

Request 330 (accepted)

- Update to 1.1.9:
+ support for ffmpeg 0.11 and libav 0.9
- wxsvg-libtoolize-fix.patch updated
- Fixes since last package version on packman:
+ fixed memory leak and storing xml file
+ fixed rendering of radial gradients
+ fixed handling of aspect ratio of video
+ clipPath element and visibility style property supported

Submit package home:Fisiu:branches:Multimedia / wxsvg to package Multimedia / wxsvg

wxsvg.changes Changed
x
 
1
@@ -1,4 +1,18 @@
2
 -------------------------------------------------------------------
3
+Thu Dec 13 20:16:30 UTC 2012 - fisiu@opensuse.org
4
+
5
+- Update to 1.1.9:
6
+  + support for ffmpeg 0.11 and libav 0.9
7
+
8
+- wxsvg-libtoolize-fix.patch updated
9
+
10
+- Fixes since last package version on packman:
11
+  + fixed memory leak and storing xml file
12
+  + fixed rendering of radial gradients
13
+  + fixed handling of aspect ratio of video
14
+  + clipPath element and visibility style property supported
15
+
16
+-------------------------------------------------------------------
17
 Sat May 19 19:30:41 UTC 2012 - seife+obs@b1-systems.com
18
 
19
 - fix build with newer libtool (12.2)
20
wxsvg.spec Changed
33
 
1
@@ -3,17 +3,17 @@
2
 %define         soname      0
3
 
4
 Name:           wxsvg
5
-Version:        1.1.5
6
-Release:        1
7
+Version:        1.1.9
8
+Release:        0
9
 Summary:        Library to create, manipulate and render SVG files
10
 URL:            http://wxsvg.sourceforge.net/
11
-License:        LGPL
12
+License:        WXwindows
13
 Group:          System/Libraries
14
 Source:         http://prdownloads.sourceforge.net/wxsvg/%{name}-%{version}.tar.bz2
15
-Patch0:         wxsvg-1.1.5-libtoolize-fix.patch
16
+Patch0:         wxsvg-libtoolize-fix.patch
17
 BuildRoot:      %{_tmppath}/%{name}-buildroot
18
 BuildRequires:  autoconf automake libtool
19
-BuildRequires:  gcc-c++ libart_lgpl-devel libffmpeg_oldabi-devel
20
+BuildRequires:  gcc-c++ libart_lgpl-devel libffmpeg-devel
21
 %if 0%{?suse_version} > 1130
22
 %define         _use_internal_dependency_generator 0
23
 %define         __find_requires %wx_requires
24
@@ -51,7 +51,7 @@
25
 
26
 %prep
27
 %setup -q -n %{name}-%{version}
28
-%patch0 -p1
29
+%patch0 -p0
30
 
31
 %build
32
 libtoolize --force --copy
33
wxsvg-1.1.5-libtoolize-fix.patch Deleted
19
 
1
@@ -1,17 +0,0 @@
2
-Index: b/configure.in
3
-===================================================================
4
---- a/configure.in
5
-+++ b/configure.in
6
-@@ -1,11 +1,11 @@
7
- # Process this file with autoconf to produce a configure script.
8
- 
9
- # initialization
10
- AC_PREREQ(2.57)
11
- AC_INIT(wxsvg, 1.1.5, wx-svg-users@lists.sourceforge.net)
12
--AC_CONFIG_MACRO_DIR(m4)
13
-+#AC_CONFIG_MACRO_DIR(m4)
14
- AM_INIT_AUTOMAKE(foreign)
15
- AM_MAINTAINER_MODE
16
- 
17
- # library versioning (quoted from libtool doc)
18
- # 1. Update the version information only immediately before a public release
19
wxsvg-libtoolize-fix.patch Added
15
 
1
@@ -0,0 +1,13 @@
2
+Index: configure.in
3
+===================================================================
4
+--- configure.in.orig
5
++++ configure.in
6
+@@ -3,7 +3,7 @@
7
+ # initialization
8
+ AC_PREREQ(2.57)
9
+ AC_INIT(wxsvg, 1.1.9, wx-svg-users@lists.sourceforge.net)
10
+-AC_CONFIG_MACRO_DIR(m4)
11
++#AC_CONFIG_MACRO_DIR(m4)
12
+ AM_INIT_AUTOMAKE(foreign)
13
+ AM_MAINTAINER_MODE
14
+ 
15
wxsvg-1.1.5.tar.bz2/ChangeLog -> wxsvg-1.1.9.tar.bz2/ChangeLog Changed
30
 
1
@@ -1,3 +1,28 @@
2
+Version 1.1.9 <2012.06.25>
3
+--------------------------
4
+
5
+  * added support of libav 0.9 / ffmpeg 0.11
6
+
7
+Version 1.1.8 <2012.04.12>
8
+--------------------------
9
+
10
+  * fixed memory leak
11
+  * fixed storing of xml file
12
+
13
+Version 1.1.7 <2012.04.01>
14
+--------------------------
15
+
16
+  * wxFfmpegMediaDecoder: fixed GetDuration()
17
+  * fixed rendering of radial gradients (thanks to frustum)
18
+  * added support of libav
19
+
20
+Version 1.1.6 <2012.01.13>
21
+--------------------------
22
+  
23
+  * added support of clipPath element
24
+  * added support of visibility style property
25
+  * fixed handling of aspect ratio of video
26
+
27
 Version 1.1.5 <2011.11.24>
28
 --------------------------
29
 
30
wxsvg-1.1.5.tar.bz2/INSTALL -> wxsvg-1.1.9.tar.bz2/INSTALL Changed
15
 
1
@@ -1,7 +1,6 @@
2
-TODO: wrtite this file.
3
-
4
-Cygwin --> mingw
5
-
6
-./autogen.sh
7
-CC="gcc -mno-cygwin -mwindows" CXX="g++ -mno-cygwin -mwindows" LDFLAGS="-mno-cygwin -mwindows" ./configure --build=i686-pc-mingw32 --host=i686-pc-mingw32 --prefix=/opt/wxsvg/1.0/ --enable-render=agg --with-libagg=/opt/agg/2.5/ --with-wxdir=/opt/wx/2.8/bin
8
-
9
+TODO: wrtite this file.
10
+
11
+Mingw:
12
+   ./autogen.sh
13
+   CC="gcc -mno-cygwin -mwindows" CXX="g++ -mno-cygwin -mwindows" LDFLAGS="-mno-cygwin -mwindows" ./configure
14
+
15
wxsvg-1.1.5.tar.bz2/Makefile.am -> wxsvg-1.1.9.tar.bz2/Makefile.am Changed
8
 
1
@@ -1,5 +1,5 @@
2
 SUBDIRS = src svgview include
3
-ACLOCAL_AMFLAGS = -I. -I m4
4
+ACLOCAL_AMFLAGS = -I m4
5
 
6
 pkgconfigdir = $(libdir)/pkgconfig
7
 pkgconfig_DATA = libwxsvg.pc
8
wxsvg-1.1.5.tar.bz2/Makefile.in -> wxsvg-1.1.9.tar.bz2/Makefile.in Changed
218
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -80,6 +80,12 @@
15
 am__base_list = \
16
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18
+am__uninstall_files_from_dir = { \
19
+  test -z "$$files" \
20
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
21
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
22
+         $(am__cd) "$$dir" && rm -f $$files; }; \
23
+  }
24
 am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
25
 DATA = $(pkgconfig_DATA)
26
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive    \
27
@@ -94,9 +100,11 @@
28
 distdir = $(PACKAGE)-$(VERSION)
29
 top_distdir = $(distdir)
30
 am__remove_distdir = \
31
-  { test ! -d "$(distdir)" \
32
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
33
-         && rm -fr "$(distdir)"; }; }
34
+  if test -d "$(distdir)"; then \
35
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
36
+      && rm -rf "$(distdir)" \
37
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
38
+  else :; fi
39
 am__relativize = \
40
   dir0=`pwd`; \
41
   sed_first='s,^\(^/*\)/.*$$,\1,'; \
42
@@ -125,6 +133,8 @@
43
 DIST_ARCHIVES = $(distdir).tar.gz
44
 GZIP_ENV = --best
45
 distuninstallcheck_listfiles = find . -type f -print
46
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
47
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
48
 distcleancheck_listfiles = find . -type f -print
49
 ACLOCAL = @ACLOCAL@
50
 AMTAR = @AMTAR@
51
@@ -155,8 +165,6 @@
52
 ECHO_T = @ECHO_T@
53
 EGREP = @EGREP@
54
 EXEEXT = @EXEEXT@
55
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
56
-FFMPEG_LIBS = @FFMPEG_LIBS@
57
 FGREP = @FGREP@
58
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
59
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
60
@@ -176,6 +184,8 @@
61
 LIBART_CFLAGS = @LIBART_CFLAGS@
62
 LIBART_CONFIG = @LIBART_CONFIG@
63
 LIBART_LIBS = @LIBART_LIBS@
64
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
65
+LIBAV_LIBS = @LIBAV_LIBS@
66
 LIBOBJS = @LIBOBJS@
67
 LIBRARY_VERSION = @LIBRARY_VERSION@
68
 LIBS = @LIBS@
69
@@ -223,6 +233,9 @@
70
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
71
 WX_RESCOMP = @WX_RESCOMP@
72
 WX_VERSION = @WX_VERSION@
73
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
74
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
75
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
76
 abs_builddir = @abs_builddir@
77
 abs_srcdir = @abs_srcdir@
78
 abs_top_builddir = @abs_top_builddir@
79
@@ -277,14 +290,14 @@
80
 top_builddir = @top_builddir@
81
 top_srcdir = @top_srcdir@
82
 SUBDIRS = src svgview include
83
-ACLOCAL_AMFLAGS = -I. -I m4
84
+ACLOCAL_AMFLAGS = -I m4
85
 pkgconfigdir = $(libdir)/pkgconfig
86
 pkgconfig_DATA = libwxsvg.pc
87
 EXTRA_DIST = libwxsvg.pc.in
88
 all: all-recursive
89
 
90
 .SUFFIXES:
91
-am--refresh:
92
+am--refresh: Makefile
93
    @:
94
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
95
    @for dep in $?; do \
96
@@ -346,9 +359,7 @@
97
    @$(NORMAL_UNINSTALL)
98
    @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
99
    files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
100
-   test -n "$$files" || exit 0; \
101
-   echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
102
-   cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
103
+   dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
104
 
105
 # This directory's subdirectories are mostly independent; you can cd
106
 # into them and run `make' without going through this Makefile.
107
@@ -557,7 +568,11 @@
108
    $(am__remove_distdir)
109
 
110
 dist-bzip2: distdir
111
-   tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
112
+   tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
113
+   $(am__remove_distdir)
114
+
115
+dist-lzip: distdir
116
+   tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
117
    $(am__remove_distdir)
118
 
119
 dist-lzma: distdir
120
@@ -565,7 +580,7 @@
121
    $(am__remove_distdir)
122
 
123
 dist-xz: distdir
124
-   tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
125
+   tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
126
    $(am__remove_distdir)
127
 
128
 dist-tarZ: distdir
129
@@ -596,6 +611,8 @@
130
      bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
131
    *.tar.lzma*) \
132
      lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
133
+   *.tar.lz*) \
134
+     lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
135
    *.tar.xz*) \
136
      xz -dc $(distdir).tar.xz | $(am__untar) ;;\
137
    *.tar.Z*) \
138
@@ -615,6 +632,7 @@
139
      && am__cwd=`pwd` \
140
      && $(am__cd) $(distdir)/_build \
141
      && ../configure --srcdir=.. --prefix="$$dc_install_base" \
142
+       $(AM_DISTCHECK_CONFIGURE_FLAGS) \
143
        $(DISTCHECK_CONFIGURE_FLAGS) \
144
      && $(MAKE) $(AM_MAKEFLAGS) \
145
      && $(MAKE) $(AM_MAKEFLAGS) dvi \
146
@@ -643,8 +661,16 @@
147
      list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
148
      sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
149
 distuninstallcheck:
150
-   @$(am__cd) '$(distuninstallcheck_dir)' \
151
-   && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
152
+   @test -n '$(distuninstallcheck_dir)' || { \
153
+     echo 'ERROR: trying to run $@ with an empty' \
154
+          '$$(distuninstallcheck_dir)' >&2; \
155
+     exit 1; \
156
+   }; \
157
+   $(am__cd) '$(distuninstallcheck_dir)' || { \
158
+     echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
159
+     exit 1; \
160
+   }; \
161
+   test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
162
       || { echo "ERROR: files left after uninstall:" ; \
163
            if test -n "$(DESTDIR)"; then \
164
              echo "  (check DESTDIR support)"; \
165
@@ -678,10 +704,15 @@
166
 
167
 installcheck: installcheck-recursive
168
 install-strip:
169
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
170
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
171
-     `test -z '$(STRIP)' || \
172
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
173
+   if test -z '$(STRIP)'; then \
174
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
175
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
176
+         install; \
177
+   else \
178
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
179
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
180
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
181
+   fi
182
 mostlyclean-generic:
183
 
184
 clean-generic:
185
@@ -769,19 +800,19 @@
186
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
187
    all all-am am--refresh check check-am clean clean-generic \
188
    clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
189
-   dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
190
-   distcheck distclean distclean-generic distclean-libtool \
191
-   distclean-tags distcleancheck distdir distuninstallcheck dvi \
192
-   dvi-am html html-am info info-am install install-am \
193
-   install-data install-data-am install-dvi install-dvi-am \
194
-   install-exec install-exec-am install-html install-html-am \
195
-   install-info install-info-am install-man install-pdf \
196
-   install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
197
-   install-strip installcheck installcheck-am installdirs \
198
-   installdirs-am maintainer-clean maintainer-clean-generic \
199
-   mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
200
-   ps ps-am tags tags-recursive uninstall uninstall-am \
201
-   uninstall-pkgconfigDATA
202
+   dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
203
+   dist-zip distcheck distclean distclean-generic \
204
+   distclean-libtool distclean-tags distcleancheck distdir \
205
+   distuninstallcheck dvi dvi-am html html-am info info-am \
206
+   install install-am install-data install-data-am install-dvi \
207
+   install-dvi-am install-exec install-exec-am install-html \
208
+   install-html-am install-info install-info-am install-man \
209
+   install-pdf install-pdf-am install-pkgconfigDATA install-ps \
210
+   install-ps-am install-strip installcheck installcheck-am \
211
+   installdirs installdirs-am maintainer-clean \
212
+   maintainer-clean-generic mostlyclean mostlyclean-generic \
213
+   mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
214
+   uninstall uninstall-am uninstall-pkgconfigDATA
215
 
216
 
217
 run: all
218
wxsvg-1.1.5.tar.bz2/aclocal.m4 -> wxsvg-1.1.9.tar.bz2/aclocal.m4 Changed
973
 
1
@@ -1,7 +1,8 @@
2
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
3
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
4
 
5
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
6
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
7
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
8
+# Inc.
9
 # This file is free software; the Free Software Foundation
10
 # gives unlimited permission to copy and/or distribute it,
11
 # with or without modifications, as long as this notice is preserved.
12
@@ -22,8 +23,8 @@
13
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
14
 #
15
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
16
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
17
-#                 Inc.
18
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
19
+#                 Foundation, Inc.
20
 #   Written by Gordon Matzigkeit, 1996
21
 #
22
 # This file is free software; the Free Software Foundation gives
23
@@ -32,8 +33,8 @@
24
 
25
 m4_define(_LT_COPYING, dnl
26
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
27
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
28
-#                 Inc.
29
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
30
+#                 Foundation, Inc.
31
 #   Written by Gordon Matzigkeit, 1996
32
 #
33
 #   This file is part of GNU Libtool.
34
@@ -167,6 +168,8 @@
35
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
36
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
37
 
38
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
39
+dnl
40
 _LT_DECL(, host_alias, 0, The host system)dnl
41
 _LT_DECL(, host, 0)dnl
42
 _LT_DECL(, host_os, 0)dnl
43
@@ -652,7 +655,7 @@
44
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
45
 configured by $0, generated by m4_PACKAGE_STRING.
46
 
47
-Copyright (C) 2010 Free Software Foundation, Inc.
48
+Copyright (C) 2011 Free Software Foundation, Inc.
49
 This config.lt script is free software; the Free Software Foundation
50
 gives unlimited permision to copy, distribute and modify it."
51
 
52
@@ -816,6 +819,7 @@
53
 m4_case($1,
54
   C,           _LT_LANG(C),
55
   C++,     _LT_LANG(CXX),
56
+  Go,          _LT_LANG(GO),
57
   Java,        _LT_LANG(GCJ),
58
   Fortran 77,      _LT_LANG(F77),
59
   Fortran,     _LT_LANG(FC),
60
@@ -837,6 +841,29 @@
61
 )# _LT_LANG
62
 
63
 
64
+m4_ifndef(AC_PROG_GO, 
65
+# NOTE: This macro has been submitted for inclusion into   #
66
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
67
+#  a released version of Autoconf we should remove this    #
68
+#  macro and use it instead.                               #
69
+m4_defun(AC_PROG_GO,
70
+AC_LANG_PUSH(Go)dnl
71
+AC_ARG_VAR(GOC,     Go compiler command)dnl
72
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
73
+_AC_ARG_VAR_LDFLAGS()dnl
74
+AC_CHECK_TOOL(GOC, gccgo)
75
+if test -z "$GOC"; then
76
+  if test -n "$ac_tool_prefix"; then
77
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
78
+  fi
79
+fi
80
+if test -z "$GOC"; then
81
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
82
+fi
83
+)#m4_defun
84
+)#m4_ifndef
85
+
86
+
87
 # _LT_LANG_DEFAULT_CONFIG
88
 # -----------------------
89
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
90
@@ -867,6 +894,10 @@
91
        m4_ifdef(LT_PROG_GCJ,
92
    m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
93
 
94
+AC_PROVIDE_IFELSE(AC_PROG_GO,
95
+  LT_LANG(GO),
96
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
97
+
98
 AC_PROVIDE_IFELSE(LT_PROG_RC,
99
   LT_LANG(RC),
100
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
101
@@ -969,7 +1000,13 @@
102
    $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
103
      -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
104
         _lt_result=$?
105
-   if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
106
+   # If there is a non-empty error log, and "single_module"
107
+   # appears in it, assume the flag caused a linker warning
108
+        if test -s conftest.err && $GREP single_module conftest.err; then
109
+     cat conftest.err >&AS_MESSAGE_LOG_FD
110
+   # Otherwise, if the output was created with a 0 exit code from
111
+   # the compiler, it worked.
112
+   elif test -f libconftest.dylib && test $_lt_result -eq 0; then
113
      lt_cv_apple_cc_single_mod=yes
114
    else
115
      cat conftest.err >&AS_MESSAGE_LOG_FD
116
@@ -977,6 +1014,7 @@
117
    rm -rf libconftest.dylib*
118
    rm -f conftest.*
119
       fi)
120
+
121
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
122
       lt_cv_ld_exported_symbols_list,
123
       lt_cv_ld_exported_symbols_list=no
124
@@ -988,6 +1026,7 @@
125
    lt_cv_ld_exported_symbols_list=no)
126
    LDFLAGS="$save_LDFLAGS"
127
     )
128
+
129
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
130
       lt_cv_ld_force_load=no
131
       cat > conftest.c << _LT_EOF
132
@@ -1005,7 +1044,9 @@
133
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
134
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
135
       _lt_result=$?
136
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
137
+      if test -s conftest.err && $GREP force_load conftest.err; then
138
+   cat conftest.err >&AS_MESSAGE_LOG_FD
139
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
140
    lt_cv_ld_force_load=yes
141
       else
142
    cat conftest.err >&AS_MESSAGE_LOG_FD
143
@@ -1050,8 +1091,8 @@
144
 )
145
 
146
 
147
-# _LT_DARWIN_LINKER_FEATURES
148
-# --------------------------
149
+# _LT_DARWIN_LINKER_FEATURES(TAG)
150
+# ---------------------------------
151
 # Checks for linker and compiler features on darwin
152
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
153
 
154
@@ -1062,6 +1103,8 @@
155
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
156
   if test "$lt_cv_ld_force_load" = "yes"; then
157
     _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\"`'
158
+    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
159
+                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
160
   else
161
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
162
   fi
163
@@ -1345,14 +1388,27 @@
164
     CFLAGS="$SAVE_CFLAGS"
165
   fi
166
   ;;
167
-sparc*-*solaris*)
168
+*-*solaris*)
169
   # Find out which ABI we are using.
170
   echo 'int i;' > conftest.$ac_ext
171
   if AC_TRY_EVAL(ac_compile); then
172
     case `/usr/bin/file conftest.o` in
173
     *64-bit*)
174
       case $lt_cv_prog_gnu_ld in
175
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
176
+      yes*)
177
+        case $host in
178
+        i?86-*-solaris*)
179
+          LD="${LD-ld} -m elf_x86_64"
180
+          ;;
181
+        sparc*-*-solaris*)
182
+          LD="${LD-ld} -m elf64_sparc"
183
+          ;;
184
+        esac
185
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
186
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
187
+          LD="${LD-ld}_sol2"
188
+        fi
189
+        ;;
190
       *)
191
    if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
192
      LD="${LD-ld} -64"
193
@@ -1429,13 +1485,13 @@
194
 if test -n "$RANLIB"; then
195
   case $host_os in
196
   openbsd*)
197
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
198
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
199
     ;;
200
   *)
201
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
202
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
203
     ;;
204
   esac
205
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
206
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
207
 fi
208
 
209
 case $host_os in
210
@@ -1615,6 +1671,11 @@
211
     lt_cv_sys_max_cmd_len=196608
212
     ;;
213
 
214
+  os2*)
215
+    # The test takes a long time on OS/2.
216
+    lt_cv_sys_max_cmd_len=8192
217
+    ;;
218
+
219
   osf*)
220
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
221
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
222
@@ -1654,7 +1715,7 @@
223
       # If test is not a shell built-in, we'll probably end up computing a
224
       # maximum length that is only half of the actual maximum length, but
225
       # we can't tell.
226
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
227
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
228
             = "X$teststring$teststring"; } >/dev/null 2>&1 &&
229
          test $i != 17 # 1/2 MB should be enough
230
       do
231
@@ -2200,7 +2261,7 @@
232
 
233
 case $host_os in
234
 aix3*)
235
-  version_type=linux
236
+  version_type=linux # correct to gnu/linux during the next big refactor
237
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
238
   shlibpath_var=LIBPATH
239
 
240
@@ -2209,7 +2270,7 @@
241
   ;;
242
 
243
 aix4-9*)
244
-  version_type=linux
245
+  version_type=linux # correct to gnu/linux during the next big refactor
246
   need_lib_prefix=no
247
   need_version=no
248
   hardcode_into_libs=yes
249
@@ -2274,7 +2335,7 @@
250
   ;;
251
 
252
 bsdi45*)
253
-  version_type=linux
254
+  version_type=linux # correct to gnu/linux during the next big refactor
255
   need_version=no
256
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
257
   soname_spec='${libname}${release}${shared_ext}$major'
258
@@ -2413,7 +2474,7 @@
259
   ;;
260
 
261
 dgux*)
262
-  version_type=linux
263
+  version_type=linux # correct to gnu/linux during the next big refactor
264
   need_lib_prefix=no
265
   need_version=no
266
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
267
@@ -2421,10 +2482,6 @@
268
   shlibpath_var=LD_LIBRARY_PATH
269
   ;;
270
 
271
-freebsd1*)
272
-  dynamic_linker=no
273
-  ;;
274
-
275
 freebsd* | dragonfly*)
276
   # DragonFly does not have aout.  When/if they implement a new
277
   # versioning mechanism, adjust this.
278
@@ -2432,7 +2489,7 @@
279
     objformat=`/usr/bin/objformat`
280
   else
281
     case $host_os in
282
-    freebsd123*) objformat=aout ;;
283
+    freebsd23.*) objformat=aout ;;
284
     *) objformat=elf ;;
285
     esac
286
   fi
287
@@ -2450,7 +2507,7 @@
288
   esac
289
   shlibpath_var=LD_LIBRARY_PATH
290
   case $host_os in
291
-  freebsd2*)
292
+  freebsd2.*)
293
     shlibpath_overrides_runpath=yes
294
     ;;
295
   freebsd3.01* | freebsdelf3.01*)
296
@@ -2470,7 +2527,7 @@
297
   ;;
298
 
299
 gnu*)
300
-  version_type=linux
301
+  version_type=linux # correct to gnu/linux during the next big refactor
302
   need_lib_prefix=no
303
   need_version=no
304
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
305
@@ -2481,7 +2538,7 @@
306
   ;;
307
 
308
 haiku*)
309
-  version_type=linux
310
+  version_type=linux # correct to gnu/linux during the next big refactor
311
   need_lib_prefix=no
312
   need_version=no
313
   dynamic_linker="$host_os runtime_loader"
314
@@ -2542,7 +2599,7 @@
315
   ;;
316
 
317
 interix3-9*)
318
-  version_type=linux
319
+  version_type=linux # correct to gnu/linux during the next big refactor
320
   need_lib_prefix=no
321
   need_version=no
322
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
323
@@ -2558,7 +2615,7 @@
324
     nonstopux*) version_type=nonstopux ;;
325
     *)
326
    if test "$lt_cv_prog_gnu_ld" = yes; then
327
-       version_type=linux
328
+       version_type=linux # correct to gnu/linux during the next big refactor
329
    else
330
        version_type=irix
331
    fi ;;
332
@@ -2595,9 +2652,9 @@
333
   dynamic_linker=no
334
   ;;
335
 
336
-# This must be Linux ELF.
337
+# This must be glibc/ELF.
338
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
339
-  version_type=linux
340
+  version_type=linux # correct to gnu/linux during the next big refactor
341
   need_lib_prefix=no
342
   need_version=no
343
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
344
@@ -2672,7 +2729,7 @@
345
   ;;
346
 
347
 newsos6)
348
-  version_type=linux
349
+  version_type=linux # correct to gnu/linux during the next big refactor
350
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
351
   shlibpath_var=LD_LIBRARY_PATH
352
   shlibpath_overrides_runpath=yes
353
@@ -2741,7 +2798,7 @@
354
   ;;
355
 
356
 solaris*)
357
-  version_type=linux
358
+  version_type=linux # correct to gnu/linux during the next big refactor
359
   need_lib_prefix=no
360
   need_version=no
361
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
362
@@ -2766,7 +2823,7 @@
363
   ;;
364
 
365
 sysv4 | sysv4.3*)
366
-  version_type=linux
367
+  version_type=linux # correct to gnu/linux during the next big refactor
368
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
369
   soname_spec='${libname}${release}${shared_ext}$major'
370
   shlibpath_var=LD_LIBRARY_PATH
371
@@ -2790,7 +2847,7 @@
372
 
373
 sysv4*MP*)
374
   if test -d /usr/nec ;then
375
-    version_type=linux
376
+    version_type=linux # correct to gnu/linux during the next big refactor
377
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
378
     soname_spec='$libname${shared_ext}.$major'
379
     shlibpath_var=LD_LIBRARY_PATH
380
@@ -2821,7 +2878,7 @@
381
 
382
 tpf*)
383
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
384
-  version_type=linux
385
+  version_type=linux # correct to gnu/linux during the next big refactor
386
   need_lib_prefix=no
387
   need_version=no
388
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
389
@@ -2831,7 +2888,7 @@
390
   ;;
391
 
392
 uts4*)
393
-  version_type=linux
394
+  version_type=linux # correct to gnu/linux during the next big refactor
395
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
396
   soname_spec='${libname}${release}${shared_ext}$major'
397
   shlibpath_var=LD_LIBRARY_PATH
398
@@ -3253,7 +3310,7 @@
399
   lt_cv_deplibs_check_method=pass_all
400
   ;;
401
 
402
-# This must be Linux ELF.
403
+# This must be glibc/ELF.
404
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
405
   lt_cv_deplibs_check_method=pass_all
406
   ;;
407
@@ -3673,6 +3730,7 @@
408
     # which start with @ or ?.
409
     lt_cv_sys_global_symbol_pipe="$AWK '"\
410
 "     {last_section=section; section=\$ 3};"\
411
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
412
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
413
 "     \$ 0!~/External *\|/{next};"\
414
 "     / 0+ UNDEF /{next}; / UNDEF \(^|\)*()/{next};"\
415
@@ -4257,7 +4315,9 @@
416
     case $cc_basename in
417
     nvcc*) # Cuda Compiler Driver 2.2
418
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
419
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
420
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
421
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
422
+      fi
423
       ;;
424
     esac
425
   else
426
@@ -4349,18 +4409,33 @@
427
    ;;
428
       *)
429
    case `$CC -V 2>&1 | sed 5q` in
430
-   *Sun\ F* | *Sun*Fortran*)
431
+   *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
432
      # Sun Fortran 8.3 passes all unrecognized flags to the linker
433
      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
434
      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
435
      _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
436
      ;;
437
+   *Sun\ F* | *Sun*Fortran*)
438
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
439
+     _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
440
+     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
441
+     ;;
442
    *Sun\ C*)
443
      # Sun C 5.9
444
      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
445
      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
446
      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
447
      ;;
448
+        *Intel*\ CF*Compiler*)
449
+     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
450
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
451
+     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
452
+     ;;
453
+   *Portland\ Group*)
454
+     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
455
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
456
+     _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
457
+     ;;
458
    esac
459
    ;;
460
       esac
461
@@ -4520,7 +4595,9 @@
462
     ;;
463
   cygwin* | mingw* | cegcc*)
464
     case $cc_basename in
465
-    cl*) ;;
466
+    cl*)
467
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
468
+      ;;
469
     *)
470
       _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'
471
       _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
472
@@ -4548,7 +4625,6 @@
473
   _LT_TAGVAR(hardcode_direct, $1)=no
474
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
475
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
476
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
477
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
478
   _LT_TAGVAR(hardcode_minus_L, $1)=no
479
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
480
@@ -4802,8 +4878,7 @@
481
    xlf* | bgf* | bgxlf* | mpixlf*)
482
      # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
483
      _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
484
-     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
485
-     _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
486
+     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
487
      _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
488
      if test "x$supports_anon_versioning" = xyes; then
489
        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
490
@@ -5099,6 +5174,7 @@
491
    # The linker will not automatically build a static lib if we build a DLL.
492
    # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
493
    _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
494
+   _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
495
    _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'
496
    # Don't use ranlib
497
    _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
498
@@ -5145,10 +5221,6 @@
499
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
500
       ;;
501
 
502
-    freebsd1*)
503
-      _LT_TAGVAR(ld_shlibs, $1)=no
504
-      ;;
505
-
506
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
507
     # support.  Future versions do this automatically, but an explicit c++rt0.o
508
     # does not break anything, and helps significantly (at the cost of a little
509
@@ -5161,7 +5233,7 @@
510
       ;;
511
 
512
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
513
-    freebsd2*)
514
+    freebsd2.*)
515
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
516
       _LT_TAGVAR(hardcode_direct, $1)=yes
517
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
518
@@ -5200,7 +5272,6 @@
519
       fi
520
       if test "$with_gnu_ld" = no; then
521
    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
522
-   _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
523
    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
524
    _LT_TAGVAR(hardcode_direct, $1)=yes
525
    _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
526
@@ -5642,9 +5713,6 @@
527
 _LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
528
     Flag to hardcode $libdir into a binary during linking.
529
     This must work even if $libdir does not exist)
530
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
531
-    If ld is used when linking, flag to hardcode $libdir into a binary
532
-    during linking.  This must work even if $libdir does not exist)
533
 _LT_TAGDECL(, hardcode_libdir_separator, 1,
534
     Whether we need a single "-rpath" flag with a separated argument)
535
 _LT_TAGDECL(, hardcode_direct, 0,
536
@@ -5798,7 +5866,6 @@
537
 _LT_TAGVAR(hardcode_direct, $1)=no
538
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
539
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
540
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
541
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
542
 _LT_TAGVAR(hardcode_minus_L, $1)=no
543
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
544
@@ -6168,7 +6235,7 @@
545
         esac
546
         ;;
547
 
548
-      freebsd12*)
549
+      freebsd2.*)
550
         # C++ shared libraries reported to be fairly broken before
551
    # switch to ELF
552
         _LT_TAGVAR(ld_shlibs, $1)=no
553
@@ -6929,12 +6996,18 @@
554
   }
555
 };
556
 _LT_EOF
557
+, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
558
+package foo
559
+func foo() {
560
+}
561
+_LT_EOF
562
 )
563
 
564
 _lt_libdeps_save_CFLAGS=$CFLAGS
565
 case "$CC $CFLAGS " in #(
566
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
567
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
568
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
569
 esac
570
 
571
 dnl Parse the compiler output and extract the necessary
572
@@ -7131,7 +7204,6 @@
573
 _LT_TAGVAR(hardcode_direct, $1)=no
574
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
575
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
576
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
577
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
578
 _LT_TAGVAR(hardcode_minus_L, $1)=no
579
 _LT_TAGVAR(hardcode_automatic, $1)=no
580
@@ -7264,7 +7336,6 @@
581
 _LT_TAGVAR(hardcode_direct, $1)=no
582
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
583
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
584
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
585
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
586
 _LT_TAGVAR(hardcode_minus_L, $1)=no
587
 _LT_TAGVAR(hardcode_automatic, $1)=no
588
@@ -7447,6 +7518,73 @@
589
 )# _LT_LANG_GCJ_CONFIG
590
 
591
 
592
+# _LT_LANG_GO_CONFIG(TAG)
593
+# --------------------------
594
+# Ensure that the configuration variables for the GNU Go compiler
595
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
596
+# to write the compiler configuration to `libtool'.
597
+m4_defun(_LT_LANG_GO_CONFIG,
598
+AC_REQUIRE(LT_PROG_GO)dnl
599
+AC_LANG_SAVE
600
+
601
+# Source file extension for Go test sources.
602
+ac_ext=go
603
+
604
+# Object file extension for compiled Go test sources.
605
+objext=o
606
+_LT_TAGVAR(objext, $1)=$objext
607
+
608
+# Code to be used in simple compile tests
609
+lt_simple_compile_test_code="package main; func main() { }"
610
+
611
+# Code to be used in simple link tests
612
+lt_simple_link_test_code='package main; func main() { }'
613
+
614
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
615
+_LT_TAG_COMPILER
616
+
617
+# save warnings/boilerplate of simple test code
618
+_LT_COMPILER_BOILERPLATE
619
+_LT_LINKER_BOILERPLATE
620
+
621
+# Allow CC to be a program name with arguments.
622
+lt_save_CC=$CC
623
+lt_save_CFLAGS=$CFLAGS
624
+lt_save_GCC=$GCC
625
+GCC=yes
626
+CC=${GOC-"gccgo"}
627
+CFLAGS=$GOFLAGS
628
+compiler=$CC
629
+_LT_TAGVAR(compiler, $1)=$CC
630
+_LT_TAGVAR(LD, $1)="$LD"
631
+_LT_CC_BASENAME($compiler)
632
+
633
+# Go did not exist at the time GCC didn't implicitly link libc in.
634
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
635
+
636
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
637
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
638
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
639
+
640
+if test -n "$compiler"; then
641
+  _LT_COMPILER_NO_RTTI($1)
642
+  _LT_COMPILER_PIC($1)
643
+  _LT_COMPILER_C_O($1)
644
+  _LT_COMPILER_FILE_LOCKS($1)
645
+  _LT_LINKER_SHLIBS($1)
646
+  _LT_LINKER_HARDCODE_LIBPATH($1)
647
+
648
+  _LT_CONFIG($1)
649
+fi
650
+
651
+AC_LANG_RESTORE
652
+
653
+GCC=$lt_save_GCC
654
+CC=$lt_save_CC
655
+CFLAGS=$lt_save_CFLAGS
656
+)# _LT_LANG_GO_CONFIG
657
+
658
+
659
 # _LT_LANG_RC_CONFIG(TAG)
660
 # -------------------------
661
 # Ensure that the configuration variables for the Windows resource compiler
662
@@ -7516,6 +7654,13 @@
663
 dnl AC_DEFUN(LT_AC_PROG_GCJ, )
664
 
665
 
666
+# LT_PROG_GO
667
+# ----------
668
+AC_DEFUN(LT_PROG_GO,
669
+AC_CHECK_TOOL(GOC, gccgo,)
670
+)
671
+
672
+
673
 # LT_PROG_RC
674
 # ----------
675
 AC_DEFUN(LT_PROG_RC,
676
@@ -8180,9 +8325,24 @@
677
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
678
 m4_define(_LT_WITH_PIC,
679
 AC_ARG_WITH(pic,
680
-    AS_HELP_STRING(--with-pic,
681
+    AS_HELP_STRING(--with-pic@<:@=PKGS@:>@,
682
    try to use only PIC/non-PIC objects @<:@default=use both@:>@),
683
-    pic_mode="$withval",
684
+    lt_p=${PACKAGE-default}
685
+    case $withval in
686
+    yes|no) pic_mode=$withval ;;
687
+    *)
688
+      pic_mode=default
689
+      # Look at the argument we got.  We use all the common list separators.
690
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
691
+      for lt_pkg in $withval; do
692
+   IFS="$lt_save_ifs"
693
+   if test "X$lt_pkg" = "X$lt_p"; then
694
+     pic_mode=yes
695
+   fi
696
+      done
697
+      IFS="$lt_save_ifs"
698
+      ;;
699
+    esac,
700
     pic_mode=default)
701
 
702
 test -z "$pic_mode" && pic_mode=m4_default($1, default)
703
@@ -8354,15 +8514,15 @@
704
 
705
 # @configure_input@
706
 
707
-# serial 3293 ltversion.m4
708
+# serial 3337 ltversion.m4
709
 # This file is part of GNU Libtool
710
 
711
-m4_define(LT_PACKAGE_VERSION, 2.4)
712
-m4_define(LT_PACKAGE_REVISION, 1.3293)
713
+m4_define(LT_PACKAGE_VERSION, 2.4.2)
714
+m4_define(LT_PACKAGE_REVISION, 1.3337)
715
 
716
 AC_DEFUN(LTVERSION_VERSION,
717
-macro_version='2.4'
718
-macro_revision='1.3293'
719
+macro_version='2.4.2'
720
+macro_revision='1.3337'
721
 _LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?)
722
 _LT_DECL(, macro_revision, 0)
723
 )
724
@@ -8626,12 +8786,15 @@
725
 fidnl
726
 )# PKG_CHECK_MODULES
727
 
728
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
729
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
730
+# Foundation, Inc.
731
 #
732
 # This file is free software; the Free Software Foundation
733
 # gives unlimited permission to copy and/or distribute it,
734
 # with or without modifications, as long as this notice is preserved.
735
 
736
+# serial 1
737
+
738
 # AM_AUTOMAKE_VERSION(VERSION)
739
 # ----------------------------
740
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
741
@@ -8641,7 +8804,7 @@
742
 am__api_version='1.11'
743
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
744
 dnl require some minimum version.  Point them to the right macro.
745
-m4_if($1, 1.11.1, ,
746
+m4_if($1, 1.11.3, ,
747
       AC_FATAL(Do not call $0, use AM_INIT_AUTOMAKE($1).))dnl
748
 )
749
 
750
@@ -8657,19 +8820,21 @@
751
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
752
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
753
 AC_DEFUN(AM_SET_CURRENT_AUTOMAKE_VERSION,
754
-AM_AUTOMAKE_VERSION(1.11.1)dnl
755
+AM_AUTOMAKE_VERSION(1.11.3)dnl
756
 m4_ifndef(AC_AUTOCONF_VERSION,
757
   m4_copy(m4_PACKAGE_VERSION, AC_AUTOCONF_VERSION))dnl
758
 _AM_AUTOCONF_VERSION(m4_defn(AC_AUTOCONF_VERSION)))
759
 
760
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
761
 
762
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
763
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
764
 #
765
 # This file is free software; the Free Software Foundation
766
 # gives unlimited permission to copy and/or distribute it,
767
 # with or without modifications, as long as this notice is preserved.
768
 
769
+# serial 1
770
+
771
 # For projects using AC_CONFIG_AUX_DIR(foo), Autoconf sets
772
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
773
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
774
@@ -8751,14 +8916,14 @@
775
 Usually this means the macro was only invoked conditionally.)
776
 fi))
777
 
778
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
779
-# Free Software Foundation, Inc.
780
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
781
+# 2010, 2011 Free Software Foundation, Inc.
782
 #
783
 # This file is free software; the Free Software Foundation
784
 # gives unlimited permission to copy and/or distribute it,
785
 # with or without modifications, as long as this notice is preserved.
786
 
787
-# serial 10
788
+# serial 12
789
 
790
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
791
 # written in clear, in which case automake, when reading aclocal.m4,
792
@@ -8798,6 +8963,7 @@
793
   # instance it was reported that on HP-UX the gcc test will end up
794
   # making a dummy file named `D' -- because `-MD' means `put the output
795
   # in D'.
796
+  rm -rf conftest.dir
797
   mkdir conftest.dir
798
   # Copy depcomp to subdir because otherwise we won't find it if we're
799
   # using a relative directory.
800
@@ -8862,7 +9028,7 @@
801
    break
802
       fi
803
       ;;
804
-    msvisualcpp | msvcmsys)
805
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
806
       # This compiler won't grok `-c -o', but also, the minuso test has
807
       # not run yet.  These depmodes are late enough in the game, and
808
       # so weak that their functioning should not be impacted.
809
@@ -8927,10 +9093,13 @@
810
 if test "x$enable_dependency_tracking" != xno; then
811
   am_depcomp="$ac_aux_dir/depcomp"
812
   AMDEPBACKSLASH='\'
813
+  am__nodep='_no'
814
 fi
815
 AM_CONDITIONAL(AMDEP, test "x$enable_dependency_tracking" != xno)
816
 AC_SUBST(AMDEPBACKSLASH)dnl
817
 _AM_SUBST_NOTMAKE(AMDEPBACKSLASH)dnl
818
+AC_SUBST(am__nodep)dnl
819
+_AM_SUBST_NOTMAKE(am__nodep)dnl
820
 )
821
 
822
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
823
@@ -9152,12 +9321,15 @@
824
 done
825
 echo "timestamp for $_am_arg" >`AS_DIRNAME("$_am_arg")`/stamp-h$_am_stamp_count)
826
 
827
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
828
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
829
+# Inc.
830
 #
831
 # This file is free software; the Free Software Foundation
832
 # gives unlimited permission to copy and/or distribute it,
833
 # with or without modifications, as long as this notice is preserved.
834
 
835
+# serial 1
836
+
837
 # AM_PROG_INSTALL_SH
838
 # ------------------
839
 # Define $install_sh.
840
@@ -9197,8 +9369,8 @@
841
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
842
 # From Jim Meyering
843
 
844
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
845
-# Free Software Foundation, Inc.
846
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
847
+# 2011 Free Software Foundation, Inc.
848
 #
849
 # This file is free software; the Free Software Foundation
850
 # gives unlimited permission to copy and/or distribute it,
851
@@ -9218,7 +9390,7 @@
852
        disable, m4_define(am_maintainer_other, enable),
853
        m4_define(am_maintainer_other, enable)
854
         m4_warn(syntax, unexpected argument to AM@&t@_MAINTAINER_MODE: $1))
855
-AC_MSG_CHECKING(whether to am_maintainer_other maintainer-specific portions of Makefiles)
856
+AC_MSG_CHECKING(whether to enable maintainer-specific portions of Makefiles)
857
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
858
   AC_ARG_ENABLE(maintainer-mode,
859
   --am_maintainer_other-maintainer-mode  am_maintainer_other make rules and dependencies not useful
860
@@ -9329,12 +9501,15 @@
861
 fi
862
 )
863
 
864
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
865
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
866
+# Inc.
867
 #
868
 # This file is free software; the Free Software Foundation
869
 # gives unlimited permission to copy and/or distribute it,
870
 # with or without modifications, as long as this notice is preserved.
871
 
872
+# serial 1
873
+
874
 # AM_PROG_MKDIR_P
875
 # ---------------
876
 # Check for `mkdir -p'.
877
@@ -9357,13 +9532,14 @@
878
 
879
 # Helper functions for option handling.                     -*- Autoconf -*-
880
 
881
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
882
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
883
+# Foundation, Inc.
884
 #
885
 # This file is free software; the Free Software Foundation
886
 # gives unlimited permission to copy and/or distribute it,
887
 # with or without modifications, as long as this notice is preserved.
888
 
889
-# serial 4
890
+# serial 5
891
 
892
 # _AM_MANGLE_OPTION(NAME)
893
 # -----------------------
894
@@ -9371,13 +9547,13 @@
895
 _AM_OPTION_m4_bpatsubst($1, ^a-zA-Z0-9_, _))
896
 
897
 # _AM_SET_OPTION(NAME)
898
-# ------------------------------
899
+# --------------------
900
 # Set option NAME.  Presently that only means defining a flag for this option.
901
 AC_DEFUN(_AM_SET_OPTION,
902
 m4_define(_AM_MANGLE_OPTION($1), 1))
903
 
904
 # _AM_SET_OPTIONS(OPTIONS)
905
-# ----------------------------------
906
+# ------------------------
907
 # OPTIONS is a space-separated list of Automake options.
908
 AC_DEFUN(_AM_SET_OPTIONS,
909
 m4_foreach_w(_AM_Option, $1, _AM_SET_OPTION(_AM_Option)))
910
@@ -9453,12 +9629,14 @@
911
 fi
912
 AC_MSG_RESULT(yes))
913
 
914
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
915
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
916
 #
917
 # This file is free software; the Free Software Foundation
918
 # gives unlimited permission to copy and/or distribute it,
919
 # with or without modifications, as long as this notice is preserved.
920
 
921
+# serial 1
922
+
923
 # AM_PROG_INSTALL_STRIP
924
 # ---------------------
925
 # One issue with vendor `install' (even GNU) is that you can't
926
@@ -9481,13 +9659,13 @@
927
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
928
 AC_SUBST(INSTALL_STRIP_PROGRAM))
929
 
930
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
931
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
932
 #
933
 # This file is free software; the Free Software Foundation
934
 # gives unlimited permission to copy and/or distribute it,
935
 # with or without modifications, as long as this notice is preserved.
936
 
937
-# serial 2
938
+# serial 3
939
 
940
 # _AM_SUBST_NOTMAKE(VARIABLE)
941
 # ---------------------------
942
@@ -9496,13 +9674,13 @@
943
 AC_DEFUN(_AM_SUBST_NOTMAKE)
944
 
945
 # AM_SUBST_NOTMAKE(VARIABLE)
946
-# ---------------------------
947
+# --------------------------
948
 # Public sister of _AM_SUBST_NOTMAKE.
949
 AC_DEFUN(AM_SUBST_NOTMAKE, _AM_SUBST_NOTMAKE($@))
950
 
951
 # Check how to create a tarball.                            -*- Autoconf -*-
952
 
953
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
954
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
955
 #
956
 # This file is free software; the Free Software Foundation
957
 # gives unlimited permission to copy and/or distribute it,
958
@@ -9524,10 +9702,11 @@
959
 # a tarball read from stdin.
960
 #     $(am__untar) < result.tar
961
 AC_DEFUN(_AM_PROG_TAR,
962
-# Always define AMTAR for backward compatibility.
963
-AM_MISSING_PROG(AMTAR, tar)
964
+# Always define AMTAR for backward compatibility.  Yes, it's still used
965
+# in the wild :-(  We should find a proper way to deprecate it ...
966
+AC_SUBST(AMTAR, '$${TAR-tar}')
967
 m4_if($1, v7,
968
-     am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -',
969
+     am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -',
970
      m4_case($1, ustar,, pax,,
971
               m4_fatal(Unknown tar format))
972
 AC_MSG_CHECKING(how to create a $1 tar archive)
973
wxsvg-1.1.5.tar.bz2/config.guess -> wxsvg-1.1.9.tar.bz2/config.guess Changed
140
 
1
@@ -2,9 +2,9 @@
2
 # Attempt to guess a canonical system name.
3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
-#   2011 Free Software Foundation, Inc.
6
+#   2011, 2012 Free Software Foundation, Inc.
7
 
8
-timestamp='2011-05-11'
9
+timestamp='2012-02-10'
10
 
11
 # This file is free software; you can redistribute it and/or modify it
12
 # under the terms of the GNU General Public License as published by
13
@@ -17,9 +17,7 @@
14
 # General Public License for more details.
15
 #
16
 # You should have received a copy of the GNU General Public License
17
-# along with this program; if not, write to the Free Software
18
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
19
-# 02110-1301, USA.
20
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
21
 #
22
 # As a special exception to the GNU General Public License, if you
23
 # distribute this file as part of a program that contains a
24
@@ -57,8 +55,8 @@
25
 
26
 Originally written by Per Bothner.
27
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
28
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
29
-Software Foundation, Inc.
30
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
31
+Free Software Foundation, Inc.
32
 
33
 This is free software; see the source for copying conditions.  There is NO
34
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
35
@@ -145,7 +143,7 @@
36
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
37
     *:NetBSD:*:*)
38
    # NetBSD (nbsd) targets should (where applicable) match one or
39
-   # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
40
+   # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
41
    # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
42
    # switched to ELF, *-*-netbsd* would select the old
43
    # object file format.  This provides both forward
44
@@ -792,13 +790,12 @@
45
    echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
46
    exit ;;
47
     *:FreeBSD:*:*)
48
-   case ${UNAME_MACHINE} in
49
-       pc98)
50
-       echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
51
+   UNAME_PROCESSOR=`/usr/bin/uname -p`
52
+   case ${UNAME_PROCESSOR} in
53
        amd64)
54
        echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
55
        *)
56
-       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
57
+       echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/-(.*//'` ;;
58
    esac
59
    exit ;;
60
     i*:CYGWIN*:*)
61
@@ -807,6 +804,9 @@
62
     *:MINGW*:*)
63
    echo ${UNAME_MACHINE}-pc-mingw32
64
    exit ;;
65
+    i*:MSYS*:*)
66
+   echo ${UNAME_MACHINE}-pc-msys
67
+   exit ;;
68
     i*:windows32*:*)
69
    # uname -m includes "-pc" on this system.
70
    echo ${UNAME_MACHINE}-mingw32
71
@@ -861,6 +861,13 @@
72
     i*86:Minix:*:*)
73
    echo ${UNAME_MACHINE}-pc-minix
74
    exit ;;
75
+    aarch64:Linux:*:*)
76
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
77
+   exit ;;
78
+    aarch64_be:Linux:*:*)
79
+   UNAME_MACHINE=aarch64_be
80
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
81
+   exit ;;
82
     alpha:Linux:*:*)
83
    case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
84
      EV5)   UNAME_MACHINE=alphaev5 ;;
85
@@ -895,13 +902,16 @@
86
    echo ${UNAME_MACHINE}-unknown-linux-gnu
87
    exit ;;
88
     cris:Linux:*:*)
89
-   echo cris-axis-linux-gnu
90
+   echo ${UNAME_MACHINE}-axis-linux-gnu
91
    exit ;;
92
     crisv32:Linux:*:*)
93
-   echo crisv32-axis-linux-gnu
94
+   echo ${UNAME_MACHINE}-axis-linux-gnu
95
    exit ;;
96
     frv:Linux:*:*)
97
-   echo frv-unknown-linux-gnu
98
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
99
+   exit ;;
100
+    hexagon:Linux:*:*)
101
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
102
    exit ;;
103
     i*86:Linux:*:*)
104
    LIBC=gnu
105
@@ -943,7 +953,7 @@
106
    test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
107
    ;;
108
     or32:Linux:*:*)
109
-   echo or32-unknown-linux-gnu
110
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
111
    exit ;;
112
     padre:Linux:*:*)
113
    echo sparc-unknown-linux-gnu
114
@@ -978,13 +988,13 @@
115
    echo ${UNAME_MACHINE}-unknown-linux-gnu
116
    exit ;;
117
     tile*:Linux:*:*)
118
-   echo ${UNAME_MACHINE}-tilera-linux-gnu
119
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
120
    exit ;;
121
     vax:Linux:*:*)
122
    echo ${UNAME_MACHINE}-dec-linux-gnu
123
    exit ;;
124
     x86_64:Linux:*:*)
125
-   echo x86_64-unknown-linux-gnu
126
+   echo ${UNAME_MACHINE}-unknown-linux-gnu
127
    exit ;;
128
     xtensa*:Linux:*:*)
129
    echo ${UNAME_MACHINE}-unknown-linux-gnu
130
@@ -1315,6 +1325,9 @@
131
     i*86:AROS:*:*)
132
    echo ${UNAME_MACHINE}-pc-aros
133
    exit ;;
134
+    x86_64:VMkernel:*:*)
135
+   echo ${UNAME_MACHINE}-unknown-esx
136
+   exit ;;
137
 esac
138
 
139
 #echo '(No uname command or uname output not recognized.)' 1>&2
140
wxsvg-1.1.5.tar.bz2/config.sub -> wxsvg-1.1.9.tar.bz2/config.sub Changed
218
 
1
@@ -2,9 +2,9 @@
2
 # Configuration validation subroutine script.
3
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
5
-#   2011 Free Software Foundation, Inc.
6
+#   2011, 2012 Free Software Foundation, Inc.
7
 
8
-timestamp='2011-03-23'
9
+timestamp='2012-02-10'
10
 
11
 # This file is (in principle) common to ALL GNU software.
12
 # The presence of a machine in this file suggests that SOME GNU software
13
@@ -21,9 +21,7 @@
14
 # GNU General Public License for more details.
15
 #
16
 # You should have received a copy of the GNU General Public License
17
-# along with this program; if not, write to the Free Software
18
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
19
-# 02110-1301, USA.
20
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
21
 #
22
 # As a special exception to the GNU General Public License, if you
23
 # distribute this file as part of a program that contains a
24
@@ -76,8 +74,8 @@
25
 GNU config.sub ($timestamp)
26
 
27
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
28
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
29
-Software Foundation, Inc.
30
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
31
+Free Software Foundation, Inc.
32
 
33
 This is free software; see the source for copying conditions.  There is NO
34
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
35
@@ -132,6 +130,10 @@
36
     os=-$maybe_os
37
     basic_machine=`echo $1 | sed 's/^\(.*\)-\(^-*-^-*\)$/\1/'`
38
     ;;
39
+  android-linux)
40
+    os=-linux-android
41
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\(^-*-^-*\)$/\1/'`-unknown
42
+    ;;
43
   *)
44
     basic_machine=`echo $1 | sed 's/-^-*$//'`
45
     if  $basic_machine != $1 
46
@@ -247,17 +249,22 @@
47
    # Some are omitted here because they have special meanings below.
48
    1750a | 580 \
49
    | a29k \
50
+   | aarch64 | aarch64_be \
51
    | alpha | alphaev4-8 | alphaev56 | alphaev678 | alphapca567 \
52
    | alpha64 | alpha64ev4-8 | alpha64ev56 | alpha64ev678 | alpha64pca567 \
53
    | am33_2.0 \
54
    | arc | arm | armble | armelb | armv2345 | armv345lb | avr | avr32 \
55
+        | be32 | be64 \
56
    | bfin \
57
    | c4x | clipper \
58
    | d10v | d30v | dlx | dsp16xx \
59
+   | epiphany \
60
    | fido | fr30 | frv \
61
    | h8300 | h8500 | hppa | hppa1.01 | hppa2.0 | hppa2.0nw | hppa64 \
62
+   | hexagon \
63
    | i370 | i860 | i960 | ia64 \
64
    | ip2k | iq2000 \
65
+   | le32 | le64 \
66
    | lm32 \
67
    | m32c | m32r | m32rle | m68000 | m68k | m88k \
68
    | maxq | mb | microblaze | mcore | mep | metag \
69
@@ -291,7 +298,7 @@
70
    | pdp10 | pdp11 | pj | pjl \
71
    | powerpc | powerpc64 | powerpc64le | powerpcle \
72
    | pyramid \
73
-   | rx \
74
+   | rl78 | rx \
75
    | score \
76
    | sh | sh1234 | sh24a | sh24aeb | sh23e | sh34eb | sheb | shbe | shle | sh1234le | sh3ele \
77
    | sh64 | sh64le \
78
@@ -300,7 +307,7 @@
79
    | spu \
80
    | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
81
    | ubicom32 \
82
-   | v850 | v850e \
83
+   | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
84
    | we32k \
85
    | x86 | xc16x | xstormy16 | xtensa \
86
    | z8k | z80)
87
@@ -315,8 +322,7 @@
88
    c6x)
89
        basic_machine=tic6x-unknown
90
        ;;
91
-   m6811 | m68hc11 | m6812 | m68hc12 | picochip)
92
-       # Motorola 68HC11/12.
93
+   m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
94
        basic_machine=$basic_machine-unknown
95
        os=-none
96
        ;;
97
@@ -329,7 +335,10 @@
98
    strongarm | thumb | xscale)
99
        basic_machine=arm-unknown
100
        ;;
101
-
102
+   xgate)
103
+       basic_machine=$basic_machine-unknown
104
+       os=-none
105
+       ;;
106
    xscaleeb)
107
        basic_machine=armeb-unknown
108
        ;;
109
@@ -352,11 +361,13 @@
110
    # Recognize the basic CPU types with company name.
111
    580-* \
112
    | a29k-* \
113
+   | aarch64-* | aarch64_be-* \
114
    | alpha-* | alphaev4-8-* | alphaev56-* | alphaev678-* \
115
    | alpha64-* | alpha64ev4-8-* | alpha64ev56-* | alpha64ev678-* \
116
    | alphapca567-* | alpha64pca567-* | arc-* \
117
    | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
118
    | avr-* | avr32-* \
119
+   | be32-* | be64-* \
120
    | bfin-* | bs2000-* \
121
    | c123* | c30-* | cjt90-* | c4x-* \
122
    | clipper-* | craynv-* | cydra-* \
123
@@ -365,8 +376,10 @@
124
    | f3001-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
125
    | h8300-* | h8500-* \
126
    | hppa-* | hppa1.01-* | hppa2.0-* | hppa2.0nw-* | hppa64-* \
127
+   | hexagon-* \
128
    | i*86-* | i860-* | i960-* | ia64-* \
129
    | ip2k-* | iq2000-* \
130
+   | le32-* | le64-* \
131
    | lm32-* \
132
    | m32c-* | m32r-* | m32rle-* \
133
    | m68000-* | m6800123460-* | m68360-* | m683?2-* | m68k-* \
134
@@ -400,7 +413,7 @@
135
    | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
136
    | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
137
    | pyramid-* \
138
-   | romp-* | rs6000-* | rx-* \
139
+   | rl78-* | romp-* | rs6000-* | rx-* \
140
    | sh-* | sh1234-* | sh24a-* | sh24aeb-* | sh23e-* | sh34eb-* | sheb-* | shbe-* \
141
    | shle-* | sh1234le-* | sh3ele-* | sh64-* | sh64le-* \
142
    | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
143
@@ -408,10 +421,11 @@
144
    | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
145
    | tahoe-* \
146
    | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
147
-   | tile-* | tilegx-* \
148
+   | tile*-* \
149
    | tron-* \
150
    | ubicom32-* \
151
-   | v850-* | v850e-* | vax-* \
152
+   | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
153
+   | vax-* \
154
    | we32k-* \
155
    | x86-* | x86_64-* | xc16x-* | xps100-* \
156
    | xstormy16-* | xtensa*-* \
157
@@ -711,7 +725,6 @@
158
    i370-ibm* | ibm*)
159
        basic_machine=i370-ibm
160
        ;;
161
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
162
    i*86v32)
163
        basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
164
        os=-sysv32
165
@@ -808,10 +821,18 @@
166
    ms1-*)
167
        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
168
        ;;
169
+   msys)
170
+       basic_machine=i386-pc
171
+       os=-msys
172
+       ;;
173
    mvs)
174
        basic_machine=i370-ibm
175
        os=-mvs
176
        ;;
177
+   nacl)
178
+       basic_machine=le32-unknown
179
+       os=-nacl
180
+       ;;
181
    ncr3000)
182
        basic_machine=i486-ncr
183
        os=-sysv4
184
@@ -1120,13 +1141,8 @@
185
        basic_machine=t90-cray
186
        os=-unicos
187
        ;;
188
-   # This must be matched before tile*.
189
-   tilegx*)
190
-       basic_machine=tilegx-unknown
191
-       os=-linux-gnu
192
-       ;;
193
    tile*)
194
-       basic_machine=tile-unknown
195
+       basic_machine=$basic_machine-unknown
196
        os=-linux-gnu
197
        ;;
198
    tx39)
199
@@ -1336,7 +1352,7 @@
200
          | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
201
          | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
202
          | -chorusos* | -chorusrdb* | -cegcc* \
203
-         | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
204
+         | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
205
          | -mingw32* | -linux-gnu* | -linux-android* \
206
          | -linux-newlib* | -linux-uclibc* \
207
          | -uxpv* | -beos* | -mpeix* | -udk* \
208
@@ -1548,9 +1564,6 @@
209
        ;;
210
    m68000-sun)
211
        os=-sunos3
212
-       # This also exists in the configure program, but was not the
213
-       # default.
214
-       # os=-sunos4
215
        ;;
216
    m68*-cisco)
217
        os=-aout
218
wxsvg-1.1.5.tar.bz2/configure -> wxsvg-1.1.9.tar.bz2/configure Changed
1295
 
1
@@ -1,6 +1,6 @@
2
 #! /bin/sh
3
 # Guess values for system-dependent variables and create Makefiles.
4
-# Generated by GNU Autoconf 2.68 for wxsvg 1.1.5.
5
+# Generated by GNU Autoconf 2.68 for wxsvg 1.1.9.
6
 #
7
 # Report bugs to <wx-svg-users@lists.sourceforge.net>.
8
 #
9
@@ -570,8 +570,8 @@
10
 # Identity of this package.
11
 PACKAGE_NAME='wxsvg'
12
 PACKAGE_TARNAME='wxsvg'
13
-PACKAGE_VERSION='1.1.5'
14
-PACKAGE_STRING='wxsvg 1.1.5'
15
+PACKAGE_VERSION='1.1.9'
16
+PACKAGE_STRING='wxsvg 1.1.9'
17
 PACKAGE_BUGREPORT='wx-svg-users@lists.sourceforge.net'
18
 PACKAGE_URL=''
19
 
20
@@ -616,10 +616,13 @@
21
 LTLIBOBJS
22
 LIBOBJS
23
 WX_CONFIG_NAME
24
-FFMPEG_LIBS
25
-FFMPEG_CFLAGS
26
-USE_FFMPEG_FALSE
27
-USE_FFMPEG_TRUE
28
+LIBAV_LIBS
29
+LIBAV_CFLAGS
30
+USE_LIBAV_FALSE
31
+USE_LIBAV_TRUE
32
+WX_VERSION_MICRO
33
+WX_VERSION_MINOR
34
+WX_VERSION_MAJOR
35
 WX_RESCOMP
36
 WX_VERSION
37
 WX_LIBS_STATIC
38
@@ -694,6 +697,7 @@
39
 am__fastdepCC_FALSE
40
 am__fastdepCC_TRUE
41
 CCDEPMODE
42
+am__nodep
43
 AMDEPBACKSLASH
44
 AMDEP_FALSE
45
 AMDEP_TRUE
46
@@ -783,7 +787,7 @@
47
 with_wx_exec_prefix
48
 enable_debug
49
 enable_render
50
-enable_ffmpeg
51
+enable_libav
52
 with_datarootdir
53
 enable_dependency_tracking
54
 enable_shared
55
@@ -819,8 +823,8 @@
56
 PANGO_LIBS
57
 FONTCONFIG_CFLAGS
58
 FONTCONFIG_LIBS
59
-FFMPEG_CFLAGS
60
-FFMPEG_LIBS'
61
+LIBAV_CFLAGS
62
+LIBAV_LIBS'
63
 
64
 
65
 # Initialize some variables set by options.
66
@@ -1363,7 +1367,7 @@
67
   # Omit some internal or obsolete options to make the list less imposing.
68
   # This message is too long to be a string in the A/UX 3.1 sh.
69
   cat <<_ACEOF
70
-\`configure' configures wxsvg 1.1.5 to adapt to many kinds of systems.
71
+\`configure' configures wxsvg 1.1.9 to adapt to many kinds of systems.
72
 
73
 Usage: $0 OPTION... VAR=VALUE...
74
 
75
@@ -1433,7 +1437,7 @@
76
 
77
 if test -n "$ac_init_help"; then
78
   case $ac_init_help in
79
-     short | recursive ) echo "Configuration of wxsvg 1.1.5:";;
80
+     short | recursive ) echo "Configuration of wxsvg 1.1.9:";;
81
    esac
82
   cat <<\_ACEOF
83
 
84
@@ -1445,7 +1449,7 @@
85
              (and sometimes confusing) to the casual installer
86
   --enable-debug          Enable debugging information
87
   --enable-render=render          Specify the render: cairo (default), libart or agg
88
-  --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled)
89
+  --enable-libav         Enable libav decoder support (default: enabled)
90
   --disable-dependency-tracking  speeds up one-time build
91
   --enable-dependency-tracking   do not reject slow dependency extractors
92
   --enable-shared=PKGS  build shared libraries default=yes
93
@@ -1463,7 +1467,7 @@
94
   --with-wx-exec-prefix=PREFIX
95
                           Exec prefix where wxWidgets is installed (optional)
96
   --with-datarootdir=DIR  Use DIR as the data root PREFIX/share
97
-  --with-pic              try to use only PIC/non-PIC objects default=use
98
+  --with-pic=PKGS       try to use only PIC/non-PIC objects default=use
99
                           both
100
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
101
   --with-sysroot=DIR Search for dependent libraries within DIR
102
@@ -1500,9 +1504,9 @@
103
               C compiler flags for FONTCONFIG, overriding pkg-config
104
   FONTCONFIG_LIBS
105
               linker flags for FONTCONFIG, overriding pkg-config
106
-  FFMPEG_CFLAGS
107
-              C compiler flags for FFMPEG, overriding pkg-config
108
-  FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
109
+  LIBAV_CFLAGS
110
+              C compiler flags for LIBAV, overriding pkg-config
111
+  LIBAV_LIBS  linker flags for LIBAV, overriding pkg-config
112
 
113
 Use these variables to override the choices made by `configure' or to help
114
 it to find libraries and programs with nonstandard names/locations.
115
@@ -1570,7 +1574,7 @@
116
 test -n "$ac_init_help" && exit $ac_status
117
 if $ac_init_version; then
118
   cat <<\_ACEOF
119
-wxsvg configure 1.1.5
120
+wxsvg configure 1.1.9
121
 generated by GNU Autoconf 2.68
122
 
123
 Copyright (C) 2010 Free Software Foundation, Inc.
124
@@ -2056,11 +2060,42 @@
125
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
126
 
127
 } # ac_fn_cxx_check_header_mongrel
128
+
129
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
130
+# ---------------------------------------------------------
131
+# Tests whether HEADER exists and can be compiled using the include files in
132
+# INCLUDES, setting the cache variable VAR accordingly.
133
+ac_fn_cxx_check_header_compile ()
134
+{
135
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
136
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
137
+$as_echo_n "checking for $2... " >&6; }
138
+if eval \${$3+:} false; then :
139
+  $as_echo_n "(cached) " >&6
140
+else
141
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
142
+/* end confdefs.h.  */
143
+$4
144
+#include <$2>
145
+_ACEOF
146
+if ac_fn_cxx_try_compile "$LINENO"; then :
147
+  eval "$3=yes"
148
+else
149
+  eval "$3=no"
150
+fi
151
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
152
+fi
153
+eval ac_res=\$$3
154
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
155
+$as_echo "$ac_res" >&6; }
156
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
157
+
158
+} # ac_fn_cxx_check_header_compile
159
 cat >config.log <<_ACEOF
160
 This file contains any messages produced by compilers while
161
 running configure, to aid debugging if configure makes a mistake.
162
 
163
-It was created by wxsvg $as_me 1.1.5, which was
164
+It was created by wxsvg $as_me 1.1.9, which was
165
 generated by GNU Autoconf 2.68.  Invocation command line was
166
 
167
   $ $0 $@
168
@@ -2876,7 +2911,7 @@
169
 
170
 # Define the identity of the package.
171
  PACKAGE='wxsvg'
172
- VERSION='1.1.5'
173
+ VERSION='1.1.9'
174
 
175
 
176
 cat >>confdefs.h <<_ACEOF
177
@@ -2906,11 +2941,11 @@
178
 
179
 # We need awk for the "check" target.  The system "awk" is bad on
180
 # some platforms.
181
-# Always define AMTAR for backward compatibility.
182
-
183
-AMTAR=${AMTAR-"${am_missing_run}tar"}
184
+# Always define AMTAR for backward compatibility.  Yes, it's still used
185
+# in the wild :-(  We should find a proper way to deprecate it ...
186
+AMTAR='$${TAR-tar}'
187
 
188
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
189
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
190
 
191
 
192
 
193
@@ -2948,7 +2983,7 @@
194
 # 4. If any interfaces have been added since the last public release, then increment age.
195
 # 5. If any interfaces have been removed since the last public release then set age to 0.
196
 
197
-LIBRARY_VERSION=4:0:4 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
198
+LIBRARY_VERSION=5:2:5 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
199
 
200
 
201
 # options
202
@@ -2997,11 +3032,11 @@
203
   USE_RENDER=cairo
204
 fi
205
 
206
-# Check whether --enable-ffmpeg was given.
207
-if test "${enable_ffmpeg+set}" = set; then :
208
-  enableval=$enable_ffmpeg; enable_ffmpeg=$enableval
209
+# Check whether --enable-libav was given.
210
+if test "${enable_libav+set}" = set; then :
211
+  enableval=$enable_libav; enable_libav=$enableval
212
 else
213
-  enable_ffmpeg=yes
214
+  enable_libav=yes
215
 fi
216
 
217
 
218
@@ -3895,6 +3930,7 @@
219
 if test "x$enable_dependency_tracking" != xno; then
220
   am_depcomp="$ac_aux_dir/depcomp"
221
   AMDEPBACKSLASH='\'
222
+  am__nodep='_no'
223
 fi
224
  if test "x$enable_dependency_tracking" != xno; then
225
   AMDEP_TRUE=
226
@@ -3919,6 +3955,7 @@
227
   # instance it was reported that on HP-UX the gcc test will end up
228
   # making a dummy file named `D' -- because `-MD' means `put the output
229
   # in D'.
230
+  rm -rf conftest.dir
231
   mkdir conftest.dir
232
   # Copy depcomp to subdir because otherwise we won't find it if we're
233
   # using a relative directory.
234
@@ -3978,7 +4015,7 @@
235
    break
236
       fi
237
       ;;
238
-    msvisualcpp | msvcmsys)
239
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
240
       # This compiler won't grok `-c -o', but also, the minuso test has
241
       # not run yet.  These depmodes are late enough in the game, and
242
       # so weak that their functioning should not be impacted.
243
@@ -4303,6 +4340,7 @@
244
   # instance it was reported that on HP-UX the gcc test will end up
245
   # making a dummy file named `D' -- because `-MD' means `put the output
246
   # in D'.
247
+  rm -rf conftest.dir
248
   mkdir conftest.dir
249
   # Copy depcomp to subdir because otherwise we won't find it if we're
250
   # using a relative directory.
251
@@ -4362,7 +4400,7 @@
252
    break
253
       fi
254
       ;;
255
-    msvisualcpp | msvcmsys)
256
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
257
       # This compiler won't grok `-c -o', but also, the minuso test has
258
       # not run yet.  These depmodes are late enough in the game, and
259
       # so weak that their functioning should not be impacted.
260
@@ -4681,8 +4719,8 @@
261
 
262
 
263
 
264
-macro_version='2.4'
265
-macro_revision='1.3293'
266
+macro_version='2.4.2'
267
+macro_revision='1.3337'
268
 
269
 
270
 
271
@@ -5516,6 +5554,11 @@
272
     lt_cv_sys_max_cmd_len=196608
273
     ;;
274
 
275
+  os2*)
276
+    # The test takes a long time on OS/2.
277
+    lt_cv_sys_max_cmd_len=8192
278
+    ;;
279
+
280
   osf*)
281
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
282
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
283
@@ -5555,7 +5598,7 @@
284
       # If test is not a shell built-in, we'll probably end up computing a
285
       # maximum length that is only half of the actual maximum length, but
286
       # we can't tell.
287
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
288
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
289
             = "X$teststring$teststring"; } >/dev/null 2>&1 &&
290
          test $i != 17 # 1/2 MB should be enough
291
       do
292
@@ -5984,7 +6027,7 @@
293
   lt_cv_deplibs_check_method=pass_all
294
   ;;
295
 
296
-# This must be Linux ELF.
297
+# This must be glibc/ELF.
298
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
299
   lt_cv_deplibs_check_method=pass_all
300
   ;;
301
@@ -6625,13 +6668,13 @@
302
 if test -n "$RANLIB"; then
303
   case $host_os in
304
   openbsd*)
305
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
306
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
307
     ;;
308
   *)
309
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
310
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
311
     ;;
312
   esac
313
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
314
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
315
 fi
316
 
317
 case $host_os in
318
@@ -6778,6 +6821,7 @@
319
     # which start with @ or ?.
320
     lt_cv_sys_global_symbol_pipe="$AWK '"\
321
 "     {last_section=section; section=\$ 3};"\
322
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
323
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
324
 "     \$ 0!~/External *\|/{next};"\
325
 "     / 0+ UNDEF /{next}; / UNDEF \(^|\)*()/{next};"\
326
@@ -7167,7 +7211,7 @@
327
     CFLAGS="$SAVE_CFLAGS"
328
   fi
329
   ;;
330
-sparc*-*solaris*)
331
+*-*solaris*)
332
   # Find out which ABI we are using.
333
   echo 'int i;' > conftest.$ac_ext
334
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
335
@@ -7178,7 +7222,20 @@
336
     case `/usr/bin/file conftest.o` in
337
     *64-bit*)
338
       case $lt_cv_prog_gnu_ld in
339
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
340
+      yes*)
341
+        case $host in
342
+        i?86-*-solaris*)
343
+          LD="${LD-ld} -m elf_x86_64"
344
+          ;;
345
+        sparc*-*-solaris*)
346
+          LD="${LD-ld} -m elf64_sparc"
347
+          ;;
348
+        esac
349
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
350
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
351
+          LD="${LD-ld}_sol2"
352
+        fi
353
+        ;;
354
       *)
355
    if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
356
      LD="${LD-ld} -64"
357
@@ -7818,7 +7875,13 @@
358
    $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
359
      -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
360
         _lt_result=$?
361
-   if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
362
+   # If there is a non-empty error log, and "single_module"
363
+   # appears in it, assume the flag caused a linker warning
364
+        if test -s conftest.err && $GREP single_module conftest.err; then
365
+     cat conftest.err >&5
366
+   # Otherwise, if the output was created with a 0 exit code from
367
+   # the compiler, it worked.
368
+   elif test -f libconftest.dylib && test $_lt_result -eq 0; then
369
      lt_cv_apple_cc_single_mod=yes
370
    else
371
      cat conftest.err >&5
372
@@ -7829,6 +7892,7 @@
373
 fi
374
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
375
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
376
+
377
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
378
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
379
 if ${lt_cv_ld_exported_symbols_list+:} false; then :
380
@@ -7861,6 +7925,7 @@
381
 fi
382
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
383
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
384
+
385
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
386
 $as_echo_n "checking for -force_load linker flag... " >&6; }
387
 if ${lt_cv_ld_force_load+:} false; then :
388
@@ -7882,7 +7947,9 @@
389
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
390
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
391
       _lt_result=$?
392
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
393
+      if test -s conftest.err && $GREP force_load conftest.err; then
394
+   cat conftest.err >&5
395
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
396
    lt_cv_ld_force_load=yes
397
       else
398
    cat conftest.err >&5
399
@@ -8297,7 +8364,22 @@
400
 
401
 # Check whether --with-pic was given.
402
 if test "${with_pic+set}" = set; then :
403
-  withval=$with_pic; pic_mode="$withval"
404
+  withval=$with_pic; lt_p=${PACKAGE-default}
405
+    case $withval in
406
+    yes|no) pic_mode=$withval ;;
407
+    *)
408
+      pic_mode=default
409
+      # Look at the argument we got.  We use all the common list separators.
410
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
411
+      for lt_pkg in $withval; do
412
+   IFS="$lt_save_ifs"
413
+   if test "X$lt_pkg" = "X$lt_p"; then
414
+     pic_mode=yes
415
+   fi
416
+      done
417
+      IFS="$lt_save_ifs"
418
+      ;;
419
+    esac
420
 else
421
   pic_mode=default
422
 fi
423
@@ -8375,6 +8457,10 @@
424
 
425
 
426
 
427
+
428
+
429
+
430
+
431
 test -z "$LN_S" && LN_S="ln -s"
432
 
433
 
434
@@ -8830,7 +8916,9 @@
435
     case $cc_basename in
436
     nvcc*) # Cuda Compiler Driver 2.2
437
       lt_prog_compiler_wl='-Xlinker '
438
-      lt_prog_compiler_pic='-Xcompiler -fPIC'
439
+      if test -n "$lt_prog_compiler_pic"; then
440
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
441
+      fi
442
       ;;
443
     esac
444
   else
445
@@ -8921,18 +9009,33 @@
446
    ;;
447
       *)
448
    case `$CC -V 2>&1 | sed 5q` in
449
-   *Sun\ F* | *Sun*Fortran*)
450
+   *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
451
      # Sun Fortran 8.3 passes all unrecognized flags to the linker
452
      lt_prog_compiler_pic='-KPIC'
453
      lt_prog_compiler_static='-Bstatic'
454
      lt_prog_compiler_wl=''
455
      ;;
456
+   *Sun\ F* | *Sun*Fortran*)
457
+     lt_prog_compiler_pic='-KPIC'
458
+     lt_prog_compiler_static='-Bstatic'
459
+     lt_prog_compiler_wl='-Qoption ld '
460
+     ;;
461
    *Sun\ C*)
462
      # Sun C 5.9
463
      lt_prog_compiler_pic='-KPIC'
464
      lt_prog_compiler_static='-Bstatic'
465
      lt_prog_compiler_wl='-Wl,'
466
      ;;
467
+        *Intel*\ CF*Compiler*)
468
+     lt_prog_compiler_wl='-Wl,'
469
+     lt_prog_compiler_pic='-fPIC'
470
+     lt_prog_compiler_static='-static'
471
+     ;;
472
+   *Portland\ Group*)
473
+     lt_prog_compiler_wl='-Wl,'
474
+     lt_prog_compiler_pic='-fpic'
475
+     lt_prog_compiler_static='-Bstatic'
476
+     ;;
477
    esac
478
    ;;
479
       esac
480
@@ -9294,7 +9397,6 @@
481
   hardcode_direct=no
482
   hardcode_direct_absolute=no
483
   hardcode_libdir_flag_spec=
484
-  hardcode_libdir_flag_spec_ld=
485
   hardcode_libdir_separator=
486
   hardcode_minus_L=no
487
   hardcode_shlibpath_var=unsupported
488
@@ -9547,8 +9649,7 @@
489
    xlf* | bgf* | bgxlf* | mpixlf*)
490
      # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
491
      whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
492
-     hardcode_libdir_flag_spec=
493
-     hardcode_libdir_flag_spec_ld='-rpath $libdir'
494
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
495
      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
496
      if test "x$supports_anon_versioning" = xyes; then
497
        archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
498
@@ -9928,6 +10029,7 @@
499
    # The linker will not automatically build a static lib if we build a DLL.
500
    # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
501
    enable_shared_with_static_runtimes=yes
502
+   exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
503
    export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^BCDGRS /s/.* \(^ *\)/\1,DATA/'\'' | $SED -e '\''/^AITW /s/.* //'\'' | sort | uniq > $export_symbols'
504
    # Don't use ranlib
505
    old_postinstall_cmds='chmod 644 $oldlib'
506
@@ -9973,6 +10075,7 @@
507
   hardcode_shlibpath_var=unsupported
508
   if test "$lt_cv_ld_force_load" = "yes"; then
509
     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\"`'
510
+
511
   else
512
     whole_archive_flag_spec=''
513
   fi
514
@@ -10001,10 +10104,6 @@
515
       hardcode_shlibpath_var=no
516
       ;;
517
 
518
-    freebsd1*)
519
-      ld_shlibs=no
520
-      ;;
521
-
522
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
523
     # support.  Future versions do this automatically, but an explicit c++rt0.o
524
     # does not break anything, and helps significantly (at the cost of a little
525
@@ -10017,7 +10116,7 @@
526
       ;;
527
 
528
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
529
-    freebsd2*)
530
+    freebsd2.*)
531
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
532
       hardcode_direct=yes
533
       hardcode_minus_L=yes
534
@@ -10056,7 +10155,6 @@
535
       fi
536
       if test "$with_gnu_ld" = no; then
537
    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
538
-   hardcode_libdir_flag_spec_ld='+b $libdir'
539
    hardcode_libdir_separator=:
540
    hardcode_direct=yes
541
    hardcode_direct_absolute=yes
542
@@ -10680,11 +10778,6 @@
543
 
544
 
545
 
546
-
547
-
548
-
549
-
550
-
551
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
552
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
553
 
554
@@ -10774,7 +10867,7 @@
555
 
556
 case $host_os in
557
 aix3*)
558
-  version_type=linux
559
+  version_type=linux # correct to gnu/linux during the next big refactor
560
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
561
   shlibpath_var=LIBPATH
562
 
563
@@ -10783,7 +10876,7 @@
564
   ;;
565
 
566
 aix4-9*)
567
-  version_type=linux
568
+  version_type=linux # correct to gnu/linux during the next big refactor
569
   need_lib_prefix=no
570
   need_version=no
571
   hardcode_into_libs=yes
572
@@ -10848,7 +10941,7 @@
573
   ;;
574
 
575
 bsdi45*)
576
-  version_type=linux
577
+  version_type=linux # correct to gnu/linux during the next big refactor
578
   need_version=no
579
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
580
   soname_spec='${libname}${release}${shared_ext}$major'
581
@@ -10987,7 +11080,7 @@
582
   ;;
583
 
584
 dgux*)
585
-  version_type=linux
586
+  version_type=linux # correct to gnu/linux during the next big refactor
587
   need_lib_prefix=no
588
   need_version=no
589
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
590
@@ -10995,10 +11088,6 @@
591
   shlibpath_var=LD_LIBRARY_PATH
592
   ;;
593
 
594
-freebsd1*)
595
-  dynamic_linker=no
596
-  ;;
597
-
598
 freebsd* | dragonfly*)
599
   # DragonFly does not have aout.  When/if they implement a new
600
   # versioning mechanism, adjust this.
601
@@ -11006,7 +11095,7 @@
602
     objformat=`/usr/bin/objformat`
603
   else
604
     case $host_os in
605
-    freebsd123*) objformat=aout ;;
606
+    freebsd23.*) objformat=aout ;;
607
     *) objformat=elf ;;
608
     esac
609
   fi
610
@@ -11024,7 +11113,7 @@
611
   esac
612
   shlibpath_var=LD_LIBRARY_PATH
613
   case $host_os in
614
-  freebsd2*)
615
+  freebsd2.*)
616
     shlibpath_overrides_runpath=yes
617
     ;;
618
   freebsd3.01* | freebsdelf3.01*)
619
@@ -11044,7 +11133,7 @@
620
   ;;
621
 
622
 gnu*)
623
-  version_type=linux
624
+  version_type=linux # correct to gnu/linux during the next big refactor
625
   need_lib_prefix=no
626
   need_version=no
627
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
628
@@ -11055,7 +11144,7 @@
629
   ;;
630
 
631
 haiku*)
632
-  version_type=linux
633
+  version_type=linux # correct to gnu/linux during the next big refactor
634
   need_lib_prefix=no
635
   need_version=no
636
   dynamic_linker="$host_os runtime_loader"
637
@@ -11116,7 +11205,7 @@
638
   ;;
639
 
640
 interix3-9*)
641
-  version_type=linux
642
+  version_type=linux # correct to gnu/linux during the next big refactor
643
   need_lib_prefix=no
644
   need_version=no
645
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
646
@@ -11132,7 +11221,7 @@
647
     nonstopux*) version_type=nonstopux ;;
648
     *)
649
    if test "$lt_cv_prog_gnu_ld" = yes; then
650
-       version_type=linux
651
+       version_type=linux # correct to gnu/linux during the next big refactor
652
    else
653
        version_type=irix
654
    fi ;;
655
@@ -11169,9 +11258,9 @@
656
   dynamic_linker=no
657
   ;;
658
 
659
-# This must be Linux ELF.
660
+# This must be glibc/ELF.
661
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
662
-  version_type=linux
663
+  version_type=linux # correct to gnu/linux during the next big refactor
664
   need_lib_prefix=no
665
   need_version=no
666
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
667
@@ -11265,7 +11354,7 @@
668
   ;;
669
 
670
 newsos6)
671
-  version_type=linux
672
+  version_type=linux # correct to gnu/linux during the next big refactor
673
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
674
   shlibpath_var=LD_LIBRARY_PATH
675
   shlibpath_overrides_runpath=yes
676
@@ -11334,7 +11423,7 @@
677
   ;;
678
 
679
 solaris*)
680
-  version_type=linux
681
+  version_type=linux # correct to gnu/linux during the next big refactor
682
   need_lib_prefix=no
683
   need_version=no
684
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
685
@@ -11359,7 +11448,7 @@
686
   ;;
687
 
688
 sysv4 | sysv4.3*)
689
-  version_type=linux
690
+  version_type=linux # correct to gnu/linux during the next big refactor
691
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
692
   soname_spec='${libname}${release}${shared_ext}$major'
693
   shlibpath_var=LD_LIBRARY_PATH
694
@@ -11383,7 +11472,7 @@
695
 
696
 sysv4*MP*)
697
   if test -d /usr/nec ;then
698
-    version_type=linux
699
+    version_type=linux # correct to gnu/linux during the next big refactor
700
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
701
     soname_spec='$libname${shared_ext}.$major'
702
     shlibpath_var=LD_LIBRARY_PATH
703
@@ -11414,7 +11503,7 @@
704
 
705
 tpf*)
706
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
707
-  version_type=linux
708
+  version_type=linux # correct to gnu/linux during the next big refactor
709
   need_lib_prefix=no
710
   need_version=no
711
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
712
@@ -11424,7 +11513,7 @@
713
   ;;
714
 
715
 uts4*)
716
-  version_type=linux
717
+  version_type=linux # correct to gnu/linux during the next big refactor
718
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
719
   soname_spec='${libname}${release}${shared_ext}$major'
720
   shlibpath_var=LD_LIBRARY_PATH
721
@@ -12349,7 +12438,6 @@
722
 hardcode_direct_CXX=no
723
 hardcode_direct_absolute_CXX=no
724
 hardcode_libdir_flag_spec_CXX=
725
-hardcode_libdir_flag_spec_ld_CXX=
726
 hardcode_libdir_separator_CXX=
727
 hardcode_minus_L_CXX=no
728
 hardcode_shlibpath_var_CXX=unsupported
729
@@ -12933,6 +13021,7 @@
730
   hardcode_shlibpath_var_CXX=unsupported
731
   if test "$lt_cv_ld_force_load" = "yes"; then
732
     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\"`'
733
+
734
   else
735
     whole_archive_flag_spec_CXX=''
736
   fi
737
@@ -12977,7 +13066,7 @@
738
         esac
739
         ;;
740
 
741
-      freebsd12*)
742
+      freebsd2.*)
743
         # C++ shared libraries reported to be fairly broken before
744
    # switch to ELF
745
         ld_shlibs_CXX=no
746
@@ -13653,6 +13742,7 @@
747
 case "$CC $CFLAGS " in #(
748
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
749
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
750
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
751
 esac
752
 
753
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
754
@@ -14442,7 +14532,9 @@
755
     ;;
756
   cygwin* | mingw* | cegcc*)
757
     case $cc_basename in
758
-    cl*) ;;
759
+    cl*)
760
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
761
+      ;;
762
     *)
763
       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'
764
       exclude_expsyms_CXX='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
765
@@ -14598,8 +14690,6 @@
766
 
767
 
768
 
769
-
770
-
771
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
772
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
773
 
774
@@ -14625,7 +14715,7 @@
775
 
776
 case $host_os in
777
 aix3*)
778
-  version_type=linux
779
+  version_type=linux # correct to gnu/linux during the next big refactor
780
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
781
   shlibpath_var=LIBPATH
782
 
783
@@ -14634,7 +14724,7 @@
784
   ;;
785
 
786
 aix4-9*)
787
-  version_type=linux
788
+  version_type=linux # correct to gnu/linux during the next big refactor
789
   need_lib_prefix=no
790
   need_version=no
791
   hardcode_into_libs=yes
792
@@ -14699,7 +14789,7 @@
793
   ;;
794
 
795
 bsdi45*)
796
-  version_type=linux
797
+  version_type=linux # correct to gnu/linux during the next big refactor
798
   need_version=no
799
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
800
   soname_spec='${libname}${release}${shared_ext}$major'
801
@@ -14836,7 +14926,7 @@
802
   ;;
803
 
804
 dgux*)
805
-  version_type=linux
806
+  version_type=linux # correct to gnu/linux during the next big refactor
807
   need_lib_prefix=no
808
   need_version=no
809
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
810
@@ -14844,10 +14934,6 @@
811
   shlibpath_var=LD_LIBRARY_PATH
812
   ;;
813
 
814
-freebsd1*)
815
-  dynamic_linker=no
816
-  ;;
817
-
818
 freebsd* | dragonfly*)
819
   # DragonFly does not have aout.  When/if they implement a new
820
   # versioning mechanism, adjust this.
821
@@ -14855,7 +14941,7 @@
822
     objformat=`/usr/bin/objformat`
823
   else
824
     case $host_os in
825
-    freebsd123*) objformat=aout ;;
826
+    freebsd23.*) objformat=aout ;;
827
     *) objformat=elf ;;
828
     esac
829
   fi
830
@@ -14873,7 +14959,7 @@
831
   esac
832
   shlibpath_var=LD_LIBRARY_PATH
833
   case $host_os in
834
-  freebsd2*)
835
+  freebsd2.*)
836
     shlibpath_overrides_runpath=yes
837
     ;;
838
   freebsd3.01* | freebsdelf3.01*)
839
@@ -14893,7 +14979,7 @@
840
   ;;
841
 
842
 gnu*)
843
-  version_type=linux
844
+  version_type=linux # correct to gnu/linux during the next big refactor
845
   need_lib_prefix=no
846
   need_version=no
847
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
848
@@ -14904,7 +14990,7 @@
849
   ;;
850
 
851
 haiku*)
852
-  version_type=linux
853
+  version_type=linux # correct to gnu/linux during the next big refactor
854
   need_lib_prefix=no
855
   need_version=no
856
   dynamic_linker="$host_os runtime_loader"
857
@@ -14965,7 +15051,7 @@
858
   ;;
859
 
860
 interix3-9*)
861
-  version_type=linux
862
+  version_type=linux # correct to gnu/linux during the next big refactor
863
   need_lib_prefix=no
864
   need_version=no
865
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
866
@@ -14981,7 +15067,7 @@
867
     nonstopux*) version_type=nonstopux ;;
868
     *)
869
    if test "$lt_cv_prog_gnu_ld" = yes; then
870
-       version_type=linux
871
+       version_type=linux # correct to gnu/linux during the next big refactor
872
    else
873
        version_type=irix
874
    fi ;;
875
@@ -15018,9 +15104,9 @@
876
   dynamic_linker=no
877
   ;;
878
 
879
-# This must be Linux ELF.
880
+# This must be glibc/ELF.
881
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
882
-  version_type=linux
883
+  version_type=linux # correct to gnu/linux during the next big refactor
884
   need_lib_prefix=no
885
   need_version=no
886
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
887
@@ -15114,7 +15200,7 @@
888
   ;;
889
 
890
 newsos6)
891
-  version_type=linux
892
+  version_type=linux # correct to gnu/linux during the next big refactor
893
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
894
   shlibpath_var=LD_LIBRARY_PATH
895
   shlibpath_overrides_runpath=yes
896
@@ -15183,7 +15269,7 @@
897
   ;;
898
 
899
 solaris*)
900
-  version_type=linux
901
+  version_type=linux # correct to gnu/linux during the next big refactor
902
   need_lib_prefix=no
903
   need_version=no
904
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
905
@@ -15208,7 +15294,7 @@
906
   ;;
907
 
908
 sysv4 | sysv4.3*)
909
-  version_type=linux
910
+  version_type=linux # correct to gnu/linux during the next big refactor
911
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
912
   soname_spec='${libname}${release}${shared_ext}$major'
913
   shlibpath_var=LD_LIBRARY_PATH
914
@@ -15232,7 +15318,7 @@
915
 
916
 sysv4*MP*)
917
   if test -d /usr/nec ;then
918
-    version_type=linux
919
+    version_type=linux # correct to gnu/linux during the next big refactor
920
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
921
     soname_spec='$libname${shared_ext}.$major'
922
     shlibpath_var=LD_LIBRARY_PATH
923
@@ -15263,7 +15349,7 @@
924
 
925
 tpf*)
926
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
927
-  version_type=linux
928
+  version_type=linux # correct to gnu/linux during the next big refactor
929
   need_lib_prefix=no
930
   need_version=no
931
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
932
@@ -15273,7 +15359,7 @@
933
   ;;
934
 
935
 uts4*)
936
-  version_type=linux
937
+  version_type=linux # correct to gnu/linux during the next big refactor
938
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
939
   soname_spec='${libname}${release}${shared_ext}$major'
940
   shlibpath_var=LD_LIBRARY_PATH
941
@@ -15412,6 +15498,8 @@
942
 
943
 
944
 
945
+
946
+
947
         ac_config_commands="$ac_config_commands libtool"
948
 
949
 
950
@@ -16201,7 +16289,7 @@
951
 $as_echo_n "checking for wxWidgets version >= $min_wx_version ()... " >&6; }
952
     fi
953
 
954
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args  "
955
+            WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args "
956
 
957
     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
958
     wx_config_major_version=`echo $WX_VERSION | \
959
@@ -16240,14 +16328,13 @@
960
 
961
 
962
     if test -n "$wx_ver_ok"; then
963
-
964
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $WX_VERSION)" >&5
965
 $as_echo "yes (version $WX_VERSION)" >&6; }
966
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
967
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs `
968
 
969
                               { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wxWidgets static library" >&5
970
 $as_echo_n "checking for wxWidgets static library... " >&6; }
971
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
972
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs  2>/dev/null`
973
       if test "x$WX_LIBS_STATIC" = "x"; then
974
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
975
 $as_echo "no" >&6; }
976
@@ -16290,16 +16377,16 @@
977
       fi
978
 
979
       if test "x$wx_has_cppflags" = x ; then
980
-                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
981
+                  WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
982
          WX_CPPFLAGS=$WX_CFLAGS
983
          WX_CXXFLAGS=$WX_CFLAGS
984
 
985
          WX_CFLAGS_ONLY=$WX_CFLAGS
986
          WX_CXXFLAGS_ONLY=$WX_CFLAGS
987
       else
988
-                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
989
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
990
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
991
+                  WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags `
992
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags `
993
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags `
994
 
995
          WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
996
          WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
997
@@ -16323,7 +16410,32 @@
998
        WX_LIBS=""
999
        WX_LIBS_STATIC=""
1000
        WX_RESCOMP=""
1001
-       :
1002
+
1003
+       if test ! -z ""; then
1004
+
1005
+          wx_error_message="
1006
+    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
1007
+    build with the following settings:
1008
+
1009
+    but such build is not available.
1010
+
1011
+    To see the wxWidgets builds available on this system, please use
1012
+    'wx-config --list' command. To use the default build, returned by
1013
+    'wx-config --selected-config', use the options with their 'auto'
1014
+    default values."
1015
+
1016
+       fi
1017
+
1018
+       wx_error_message="
1019
+    The requested wxWidgets build couldn't be found.
1020
+    $wx_error_message
1021
+
1022
+    If you still get this error, then check that 'wx-config' is
1023
+    in path, the directory where wxWidgets libraries are installed
1024
+    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
1025
+    or equivalent variable and wxWidgets version is 2.6.3 or above."
1026
+
1027
+       as_fn_error $? "$wx_error_message" "$LINENO" 5
1028
 
1029
     fi
1030
   else
1031
@@ -16349,6 +16461,13 @@
1032
 
1033
 
1034
 
1035
+      WX_VERSION_MAJOR="$wx_config_major_version"
1036
+  WX_VERSION_MINOR="$wx_config_minor_version"
1037
+  WX_VERSION_MICRO="$wx_config_micro_version"
1038
+
1039
+
1040
+
1041
+
1042
 if test "$WXFOUND" != 1; then
1043
     as_fn_error $? "
1044
         Please check that wx-config is in path, the directory
1045
@@ -16419,22 +16538,22 @@
1046
 
1047
 
1048
 # check ffmpg
1049
- if test x$enable_ffmpeg = xyes; then
1050
-  USE_FFMPEG_TRUE=
1051
-  USE_FFMPEG_FALSE='#'
1052
+ if test x$enable_libav = xyes; then
1053
+  USE_LIBAV_TRUE=
1054
+  USE_LIBAV_FALSE='#'
1055
 else
1056
-  USE_FFMPEG_TRUE='#'
1057
-  USE_FFMPEG_FALSE=
1058
+  USE_LIBAV_TRUE='#'
1059
+  USE_LIBAV_FALSE=
1060
 fi
1061
 
1062
-if test x$enable_ffmpeg = xyes; then
1063
+if test x$enable_libav = xyes; then
1064
 
1065
 pkg_failed=no
1066
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
1067
-$as_echo_n "checking for FFMPEG... " >&6; }
1068
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBAV" >&5
1069
+$as_echo_n "checking for LIBAV... " >&6; }
1070
 
1071
-if test -n "$FFMPEG_CFLAGS"; then
1072
-    pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
1073
+if test -n "$LIBAV_CFLAGS"; then
1074
+    pkg_cv_LIBAV_CFLAGS="$LIBAV_CFLAGS"
1075
  elif test -n "$PKG_CONFIG"; then
1076
     if test -n "$PKG_CONFIG" && \
1077
     { { $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
1078
@@ -16442,7 +16561,7 @@
1079
   ac_status=$?
1080
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1081
   test $ac_status = 0; }; then
1082
-  pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
1083
+  pkg_cv_LIBAV_CFLAGS=`$PKG_CONFIG --cflags "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
1084
              test "x$?" != "x0" && pkg_failed=yes
1085
 else
1086
   pkg_failed=yes
1087
@@ -16450,8 +16569,8 @@
1088
  else
1089
     pkg_failed=untried
1090
 fi
1091
-if test -n "$FFMPEG_LIBS"; then
1092
-    pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
1093
+if test -n "$LIBAV_LIBS"; then
1094
+    pkg_cv_LIBAV_LIBS="$LIBAV_LIBS"
1095
  elif test -n "$PKG_CONFIG"; then
1096
     if test -n "$PKG_CONFIG" && \
1097
     { { $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
1098
@@ -16459,7 +16578,7 @@
1099
   ac_status=$?
1100
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1101
   test $ac_status = 0; }; then
1102
-  pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
1103
+  pkg_cv_LIBAV_LIBS=`$PKG_CONFIG --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>/dev/null`
1104
              test "x$?" != "x0" && pkg_failed=yes
1105
 else
1106
   pkg_failed=yes
1107
@@ -16480,22 +16599,22 @@
1108
         _pkg_short_errors_supported=no
1109
 fi
1110
         if test $_pkg_short_errors_supported = yes; then
1111
-           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`
1112
+           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`
1113
         else
1114
-           FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>&1`
1115
+           LIBAV_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale" 2>&1`
1116
         fi
1117
    # Put the nasty error message in config.log where it belongs
1118
-   echo "$FFMPEG_PKG_ERRORS" >&5
1119
+   echo "$LIBAV_PKG_ERRORS" >&5
1120
 
1121
    as_fn_error $? "Package requirements (libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale) were not met:
1122
 
1123
-$FFMPEG_PKG_ERRORS
1124
+$LIBAV_PKG_ERRORS
1125
 
1126
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
1127
 installed software in a non-standard prefix.
1128
 
1129
-Alternatively, you may set the environment variables FFMPEG_CFLAGS
1130
-and FFMPEG_LIBS to avoid the need to call pkg-config.
1131
+Alternatively, you may set the environment variables LIBAV_CFLAGS
1132
+and LIBAV_LIBS to avoid the need to call pkg-config.
1133
 See the pkg-config man page for more details." "$LINENO" 5
1134
 elif test $pkg_failed = untried; then
1135
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1136
@@ -16506,21 +16625,32 @@
1137
 is in your PATH or set the PKG_CONFIG environment variable to the full
1138
 path to pkg-config.
1139
 
1140
-Alternatively, you may set the environment variables FFMPEG_CFLAGS
1141
-and FFMPEG_LIBS to avoid the need to call pkg-config.
1142
+Alternatively, you may set the environment variables LIBAV_CFLAGS
1143
+and LIBAV_LIBS to avoid the need to call pkg-config.
1144
 See the pkg-config man page for more details.
1145
 
1146
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1147
 See \`config.log' for more details" "$LINENO" 5; }
1148
 else
1149
-   FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
1150
-   FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
1151
+   LIBAV_CFLAGS=$pkg_cv_LIBAV_CFLAGS
1152
+   LIBAV_LIBS=$pkg_cv_LIBAV_LIBS
1153
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1154
 $as_echo "yes" >&6; }
1155
 
1156
 fi
1157
-  CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG $FFMPEG_CFLAGS"
1158
-  LIBS="$LIBS $FFMPEG_LIBS"
1159
+  CXXFLAGS="$CXXFLAGS -DUSE_LIBAV $LIBAV_CFLAGS"
1160
+  LIBS="$LIBS $LIBAV_LIBS"
1161
+  ac_fn_cxx_check_header_compile "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "
1162
+#define __STDC_CONSTANT_MACROS
1163
+#define __STDC_LIMIT_MACROS
1164
+"
1165
+if test "x$ac_cv_header_libavformat_avformat_h" = xyes; then :
1166
+
1167
+else
1168
+  as_fn_error $? "*** missing libav library" "$LINENO" 5
1169
+fi
1170
+
1171
+
1172
 fi
1173
 
1174
 # vars
1175
@@ -16717,8 +16847,8 @@
1176
   as_fn_error $? "conditional \"USE_FREETYPE\" was never defined.
1177
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1178
 fi
1179
-if test -z "${USE_FFMPEG_TRUE}" && test -z "${USE_FFMPEG_FALSE}"; then
1180
-  as_fn_error $? "conditional \"USE_FFMPEG\" was never defined.
1181
+if test -z "${USE_LIBAV_TRUE}" && test -z "${USE_LIBAV_FALSE}"; then
1182
+  as_fn_error $? "conditional \"USE_LIBAV\" was never defined.
1183
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1184
 fi
1185
 
1186
@@ -17130,7 +17260,7 @@
1187
 # report actual input values of CONFIG_FILES etc. instead of their
1188
 # values after options handling.
1189
 ac_log="
1190
-This file was extended by wxsvg $as_me 1.1.5, which was
1191
+This file was extended by wxsvg $as_me 1.1.9, which was
1192
 generated by GNU Autoconf 2.68.  Invocation command line was
1193
 
1194
   CONFIG_FILES    = $CONFIG_FILES
1195
@@ -17187,7 +17317,7 @@
1196
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1197
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
1198
 ac_cs_version="\\
1199
-wxsvg config.status 1.1.5
1200
+wxsvg config.status 1.1.9
1201
 configured by $0, generated by GNU Autoconf 2.68,
1202
   with options \\"\$ac_cs_config\\"
1203
 
1204
@@ -17313,6 +17443,7 @@
1205
 enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
1206
 SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
1207
 ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
1208
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
1209
 host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
1210
 host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
1211
 host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
1212
@@ -17395,7 +17526,6 @@
1213
 allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
1214
 no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
1215
 hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
1216
-hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
1217
 hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
1218
 hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
1219
 hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
1220
@@ -17467,7 +17597,6 @@
1221
 allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
1222
 no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
1223
 hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
1224
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "$hardcode_libdir_flag_spec_ld_CXX" | $SED "$delay_single_quote_subst"`'
1225
 hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
1226
 hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
1227
 hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
1228
@@ -17506,6 +17635,7 @@
1229
 # Quote evaled strings.
1230
 for var in SHELL \
1231
 ECHO \
1232
+PATH_SEPARATOR \
1233
 SED \
1234
 GREP \
1235
 EGREP \
1236
@@ -17556,7 +17686,6 @@
1237
 allow_undefined_flag \
1238
 no_undefined_flag \
1239
 hardcode_libdir_flag_spec \
1240
-hardcode_libdir_flag_spec_ld \
1241
 hardcode_libdir_separator \
1242
 exclude_expsyms \
1243
 include_expsyms \
1244
@@ -17590,7 +17719,6 @@
1245
 allow_undefined_flag_CXX \
1246
 no_undefined_flag_CXX \
1247
 hardcode_libdir_flag_spec_CXX \
1248
-hardcode_libdir_flag_spec_ld_CXX \
1249
 hardcode_libdir_separator_CXX \
1250
 exclude_expsyms_CXX \
1251
 include_expsyms_CXX \
1252
@@ -18241,8 +18369,8 @@
1253
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
1254
 #
1255
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
1256
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
1257
-#                 Inc.
1258
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
1259
+#                 Foundation, Inc.
1260
 #   Written by Gordon Matzigkeit, 1996
1261
 #
1262
 #   This file is part of GNU Libtool.
1263
@@ -18296,6 +18424,9 @@
1264
 # An echo program that protects backslashes.
1265
 ECHO=$lt_ECHO
1266
 
1267
+# The PATH separator for the build system.
1268
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
1269
+
1270
 # The host system.
1271
 host_alias=$host_alias
1272
 host=$host
1273
@@ -18597,10 +18728,6 @@
1274
 # This must work even if \$libdir does not exist
1275
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
1276
 
1277
-# If ld is used when linking, flag to hardcode \$libdir into a binary
1278
-# during linking.  This must work even if \$libdir does not exist.
1279
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
1280
-
1281
 # Whether we need a single "-rpath" flag with a separated argument.
1282
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
1283
 
1284
@@ -18943,10 +19070,6 @@
1285
 # This must work even if \$libdir does not exist
1286
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
1287
 
1288
-# If ld is used when linking, flag to hardcode \$libdir into a binary
1289
-# during linking.  This must work even if \$libdir does not exist.
1290
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
1291
-
1292
 # Whether we need a single "-rpath" flag with a separated argument.
1293
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
1294
 
1295
wxsvg-1.1.5.tar.bz2/configure.in -> wxsvg-1.1.9.tar.bz2/configure.in Changed
61
 
1
@@ -2,7 +2,7 @@
2
 
3
 # initialization
4
 AC_PREREQ(2.57)
5
-AC_INIT(wxsvg, 1.1.5, wx-svg-users@lists.sourceforge.net)
6
+AC_INIT(wxsvg, 1.1.9, wx-svg-users@lists.sourceforge.net)
7
 AC_CONFIG_MACRO_DIR(m4)
8
 AM_INIT_AUTOMAKE(foreign)
9
 AM_MAINTAINER_MODE
10
@@ -15,7 +15,7 @@
11
 # 4. If any interfaces have been added since the last public release, then increment age.
12
 # 5. If any interfaces have been removed since the last public release then set age to 0.
13
 
14
-LIBRARY_VERSION=4:0:4 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
15
+LIBRARY_VERSION=5:2:5 # current:revision:age -> libwxsvg.so.(C-A).(A).(R)
16
 AC_SUBST(LIBRARY_VERSION)
17
 
18
 # options
19
@@ -26,9 +26,9 @@
20
 AC_ARG_ENABLE(render,
21
    --enable-render=render          Specify the render: cairo (default), libart or agg,
22
  USE_RENDER=$enableval, USE_RENDER=cairo)
23
-AC_ARG_ENABLE(ffmpeg,
24
-   --enable-ffmpeg         Enable ffmpeg decoder support (default: enabled),
25
- enable_ffmpeg=$enableval,enable_ffmpeg=yes)
26
+AC_ARG_ENABLE(libav,
27
+   --enable-libav         Enable libav decoder support (default: enabled),
28
+ enable_libav=$enableval,enable_libav=yes)
29
 AC_ARG_WITH(datarootdir,
30
    --with-datarootdir=DIR  Use DIR as the data root PREFIX/share,
31
  datarootdir="\${prefix}/$with_datarootdir", datarootdir='$(prefix)/share')
32
@@ -161,7 +161,7 @@
33
 AM_CONDITIONAL(USE_FREETYPE, test "$font_engine" = "freetype")
34
 
35
 # check wxWidgets >= 2.6.3
36
-AM_PATH_WXCONFIG(2.6.3, WXFOUND=1)
37
+WX_CONFIG_CHECK(2.6.3, WXFOUND=1)
38
 if test "$WXFOUND" != 1; then
39
     AC_MSG_ERROR(
40
         Please check that wx-config is in path, the directory
41
@@ -178,11 +178,14 @@
42
 AC_CHECK_HEADER(expat.h,,AC_MSG_ERROR(*** missing expat library))
43
 
44
 # check ffmpg
45
-AM_CONDITIONAL(USE_FFMPEG, test x$enable_ffmpeg = xyes)
46
-if test x$enable_ffmpeg = xyes; then
47
-  PKG_CHECK_MODULES(FFMPEG, libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale)
48
-  CXXFLAGS="$CXXFLAGS -DUSE_FFMPEG $FFMPEG_CFLAGS"
49
-  LIBS="$LIBS $FFMPEG_LIBS"
50
+AM_CONDITIONAL(USE_LIBAV, test x$enable_libav = xyes)
51
+if test x$enable_libav = xyes; then
52
+  PKG_CHECK_MODULES(LIBAV, libavformat >= 50.0.0 libavcodec >= 51.0.0 libavutil >= 49.0.0 libswscale)
53
+  CXXFLAGS="$CXXFLAGS -DUSE_LIBAV $LIBAV_CFLAGS"
54
+  LIBS="$LIBS $LIBAV_LIBS"
55
+  AC_CHECK_HEADER(libavformat/avformat.h,,AC_MSG_ERROR(*** missing libav library),
56
+#define __STDC_CONSTANT_MACROS
57
+#define __STDC_LIMIT_MACROS)
58
 fi
59
 
60
 # vars
61
wxsvg-1.1.5.tar.bz2/include/Makefile.in -> wxsvg-1.1.9.tar.bz2/include/Makefile.in Changed
62
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -115,8 +115,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -136,6 +134,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -183,6 +183,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -485,10 +488,15 @@
43
 
44
 installcheck: installcheck-recursive
45
 install-strip:
46
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
47
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
48
-     `test -z '$(STRIP)' || \
49
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
50
+   if test -z '$(STRIP)'; then \
51
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
52
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
53
+         install; \
54
+   else \
55
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
58
+   fi
59
 mostlyclean-generic:
60
 
61
 clean-generic:
62
wxsvg-1.1.5.tar.bz2/include/wxSVG/Makefile.in -> wxsvg-1.1.9.tar.bz2/include/wxSVG/Makefile.in Changed
86
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -67,6 +67,12 @@
15
 am__base_list = \
16
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18
+am__uninstall_files_from_dir = { \
19
+  test -z "$$files" \
20
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
21
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
22
+         $(am__cd) "$$dir" && rm -f $$files; }; \
23
+  }
24
 am__installdirs = "$(DESTDIR)$(pkgincludedir)"
25
 HEADERS = $(pkginclude_HEADERS)
26
 ETAGS = etags
27
@@ -102,8 +108,6 @@
28
 ECHO_T = @ECHO_T@
29
 EGREP = @EGREP@
30
 EXEEXT = @EXEEXT@
31
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
32
-FFMPEG_LIBS = @FFMPEG_LIBS@
33
 FGREP = @FGREP@
34
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
35
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
36
@@ -123,6 +127,8 @@
37
 LIBART_CFLAGS = @LIBART_CFLAGS@
38
 LIBART_CONFIG = @LIBART_CONFIG@
39
 LIBART_LIBS = @LIBART_LIBS@
40
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
41
+LIBAV_LIBS = @LIBAV_LIBS@
42
 LIBOBJS = @LIBOBJS@
43
 LIBRARY_VERSION = @LIBRARY_VERSION@
44
 LIBS = @LIBS@
45
@@ -170,6 +176,9 @@
46
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
47
 WX_RESCOMP = @WX_RESCOMP@
48
 WX_VERSION = @WX_VERSION@
49
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
50
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
51
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
52
 abs_builddir = @abs_builddir@
53
 abs_srcdir = @abs_srcdir@
54
 abs_top_builddir = @abs_top_builddir@
55
@@ -280,9 +289,7 @@
56
    @$(NORMAL_UNINSTALL)
57
    @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
58
    files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
59
-   test -n "$$files" || exit 0; \
60
-   echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
61
-   cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
62
+   dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
63
 
64
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
65
    list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
66
@@ -383,10 +390,15 @@
67
 
68
 installcheck: installcheck-am
69
 install-strip:
70
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
71
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
72
-     `test -z '$(STRIP)' || \
73
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
74
+   if test -z '$(STRIP)'; then \
75
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
76
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
77
+         install; \
78
+   else \
79
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
80
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
81
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
82
+   fi
83
 mostlyclean-generic:
84
 
85
 clean-generic:
86
wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGCanvasItem.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGCanvasItem.h Changed
21
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     Canvas items
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/09
5
-// RCS-ID:      $Id: SVGCanvasItem.h,v 1.21 2011/11/23 22:14:53 ntalex Exp $
6
+// RCS-ID:      $Id: SVGCanvasItem.h,v 1.22 2012/01/06 03:12:45 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 /////////////////////////////////////////////////////////////////////////////
10
@@ -147,8 +147,8 @@
11
 /** Canvas item, that saves image (SVGImageElement) */
12
 class wxSVGCanvasImage: public wxSVGCanvasItem {
13
 public:
14
-   wxSVGCanvasImage(): wxSVGCanvasItem(wxSVG_CANVAS_ITEM_IMAGE), m_svgImage(NULL) {}
15
-   wxSVGCanvasImage(wxSVGCanvasItemType type): wxSVGCanvasItem(type), m_svgImage(NULL) {}
16
+   wxSVGCanvasImage(): wxSVGCanvasItem(wxSVG_CANVAS_ITEM_IMAGE), m_defHeightScale(1), m_svgImage(NULL) {}
17
+   wxSVGCanvasImage(wxSVGCanvasItemType type): wxSVGCanvasItem(type), m_defHeightScale(1), m_svgImage(NULL) {}
18
    virtual ~wxSVGCanvasImage();
19
    virtual void Init(wxSVGImageElement& element, const wxCSSStyleDeclaration& style);
20
    virtual int GetDefaultWidth();
21
wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGFEGaussianBlurElement.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGFEGaussianBlurElement.h Changed
9
 
1
@@ -27,6 +27,7 @@
2
     bool HasCustomAttribute(const wxString& name);
3
     wxString GetCustomAttribute(const wxString& name);
4
     bool SetCustomAttribute(const wxString& name, const wxString& value);
5
+    wxSvgXmlAttrHash GetCustomAttributes() const;
6
 
7
   public:
8
     inline const wxSVGAnimatedString& GetIn1() const { return m_in1; }
9
wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGRadialGradientElement.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGRadialGradientElement.h Changed
15
 
1
@@ -51,6 +51,13 @@
2
       wxSVGGradientElement(tagName) {}
3
     virtual ~wxSVGRadialGradientElement() {}
4
     wxSvgXmlNode* CloneNode(bool deep = true) { return new wxSVGRadialGradientElement(*this); }
5
+
6
+    double GetQualifiedR() const;
7
+    double GetQualifiedCx() const;
8
+    double GetQualifiedCy() const;
9
+    double GetQualifiedFx() const;
10
+    double GetQualifiedFy() const;
11
+
12
     bool HasAttribute(const wxString& name);
13
     wxString GetAttribute(const wxString& name);
14
     bool SetAttribute(const wxString& name, const wxString& value);
15
wxsvg-1.1.5.tar.bz2/include/wxSVG/SVGStylable.h -> wxsvg-1.1.9.tar.bz2/include/wxSVG/SVGStylable.h Changed
9
 
1
@@ -25,6 +25,7 @@
2
     bool HasCustomAttribute(const wxString& name);
3
     wxString GetCustomAttribute(const wxString& name);
4
     bool SetCustomAttribute(const wxString& name, const wxString& value);
5
+    wxSvgXmlAttrHash GetCustomAttributes() const;
6
 
7
   public:
8
     inline const wxSVGAnimatedString& GetClassName() const { return m_className; }
9
wxsvg-1.1.5.tar.bz2/include/wxSVGXML/Makefile.in -> wxsvg-1.1.9.tar.bz2/include/wxSVGXML/Makefile.in Changed
86
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -67,6 +67,12 @@
15
 am__base_list = \
16
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18
+am__uninstall_files_from_dir = { \
19
+  test -z "$$files" \
20
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
21
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
22
+         $(am__cd) "$$dir" && rm -f $$files; }; \
23
+  }
24
 am__installdirs = "$(DESTDIR)$(pkgincludedir)"
25
 HEADERS = $(pkginclude_HEADERS)
26
 ETAGS = etags
27
@@ -102,8 +108,6 @@
28
 ECHO_T = @ECHO_T@
29
 EGREP = @EGREP@
30
 EXEEXT = @EXEEXT@
31
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
32
-FFMPEG_LIBS = @FFMPEG_LIBS@
33
 FGREP = @FGREP@
34
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
35
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
36
@@ -123,6 +127,8 @@
37
 LIBART_CFLAGS = @LIBART_CFLAGS@
38
 LIBART_CONFIG = @LIBART_CONFIG@
39
 LIBART_LIBS = @LIBART_LIBS@
40
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
41
+LIBAV_LIBS = @LIBAV_LIBS@
42
 LIBOBJS = @LIBOBJS@
43
 LIBRARY_VERSION = @LIBRARY_VERSION@
44
 LIBS = @LIBS@
45
@@ -170,6 +176,9 @@
46
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
47
 WX_RESCOMP = @WX_RESCOMP@
48
 WX_VERSION = @WX_VERSION@
49
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
50
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
51
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
52
 abs_builddir = @abs_builddir@
53
 abs_srcdir = @abs_srcdir@
54
 abs_top_builddir = @abs_top_builddir@
55
@@ -280,9 +289,7 @@
56
    @$(NORMAL_UNINSTALL)
57
    @list='$(pkginclude_HEADERS)'; test -n "$(pkgincludedir)" || list=; \
58
    files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
59
-   test -n "$$files" || exit 0; \
60
-   echo " ( cd '$(DESTDIR)$(pkgincludedir)' && rm -f" $$files ")"; \
61
-   cd "$(DESTDIR)$(pkgincludedir)" && rm -f $$files
62
+   dir='$(DESTDIR)$(pkgincludedir)'; $(am__uninstall_files_from_dir)
63
 
64
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
65
    list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
66
@@ -383,10 +390,15 @@
67
 
68
 installcheck: installcheck-am
69
 install-strip:
70
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
71
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
72
-     `test -z '$(STRIP)' || \
73
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
74
+   if test -z '$(STRIP)'; then \
75
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
76
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
77
+         install; \
78
+   else \
79
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
80
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
81
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
82
+   fi
83
 mostlyclean-generic:
84
 
85
 clean-generic:
86
wxsvg-1.1.5.tar.bz2/include/wxSVGXML/svgxml.h -> wxsvg-1.1.9.tar.bz2/include/wxSVGXML/svgxml.h Changed
63
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     wxSvgXmlDocument - XML parser & data holder class
3
 // Author:      Vaclav Slavik
4
 // Created:     2000/03/05
5
-// RCS-ID:      $Id: svgxml.h,v 1.4 2010/02/22 20:00:42 ntalex Exp $
6
+// RCS-ID:      $Id: svgxml.h,v 1.5 2012/04/09 12:20:07 ntalex Exp $
7
 // Copyright:   (c) 2000 Vaclav Slavik
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -19,6 +19,7 @@
11
 #include <wx/object.h>
12
 #include <wx/list.h>
13
 #include <wx/hashmap.h>
14
+#include <vector>
15
 
16
 class wxSvgXmlNode;
17
 class wxSvgXmlProperty;
18
@@ -75,20 +76,33 @@
19
     wxSvgXmlProperty *m_next;
20
 };
21
 
22
+class wxSvgXmlAttribute {
23
+public:
24
+   wxSvgXmlAttribute() {}
25
+   wxSvgXmlAttribute(const wxString& name, const wxString& value): m_name(name), m_value(value) {}
26
 
27
-WX_DECLARE_STRING_HASH_MAP(wxString, wxSvgXmlAttrHashBase);
28
-class wxSvgXmlAttrHash: public wxSvgXmlAttrHashBase
29
-{
30
-  public:
31
-    void Add(wxString key, wxString value) { (*this)key = value; }
32
-    void Add(const wxSvgXmlAttrHash& value)
33
-    {
34
-      wxSvgXmlAttrHash::const_iterator it; 
35
-      for(it = value.begin(); it != value.end(); ++it)
36
-        insert(*it);
37
-    }
38
+    wxString GetName() const { return m_name; }
39
+    wxString GetValue() const { return m_value; }
40
+
41
+    void SetName(const wxString& name) { m_name = name; }
42
+    void SetValue(const wxString& value) { m_value = value; }
43
+
44
+private:
45
+    wxString m_name;
46
+    wxString m_value;
47
 };
48
 
49
+class wxSvgXmlAttrHash: public std::vector<wxSvgXmlAttribute> {
50
+public:
51
+    void Add(wxString name, wxString value) {
52
+       push_back(wxSvgXmlAttribute(name, value));
53
+   }
54
+   void Add(const wxSvgXmlAttrHash& value) {
55
+       wxSvgXmlAttrHash::const_iterator it;
56
+       for (it = value.begin(); it != value.end(); ++it)
57
+           push_back(*it);
58
+   }
59
+};
60
 
61
 // Represents node in XML document. Node has name and may have content
62
 // and properties. Most common node types are wxSVGXML_TEXT_NODE (name and props
63
wxsvg-1.1.5.tar.bz2/ltmain.sh -> wxsvg-1.1.9.tar.bz2/ltmain.sh Changed
274
 
1
@@ -1,9 +1,9 @@
2
 
3
-# libtool (GNU libtool) 2.4
4
+# libtool (GNU libtool) 2.4.2
5
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
6
 
7
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
8
-# 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
9
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
10
 # This is free software; see the source for copying conditions.  There is NO
11
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
12
 
13
@@ -41,6 +41,7 @@
14
 #       --quiet, --silent    don't print informational messages
15
 #       --no-quiet, --no-silent
16
 #                            print informational messages (default)
17
+#       --no-warn            don't display warning messages
18
 #       --tag=TAG            use configuration variables from tag TAG
19
 #   -v, --verbose            print more informational messages than default
20
 #       --no-verbose         don't print the extra informational messages
21
@@ -69,7 +70,7 @@
22
 #         compiler:        $LTCC
23
 #         compiler flags:      $LTCFLAGS
24
 #         linker:      $LD (gnu? $with_gnu_ld)
25
-#         $progname:   (GNU libtool) 2.4 Debian-2.4-2ubuntu1
26
+#         $progname:   (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1
27
 #         automake:    $automake_version
28
 #         autoconf:    $autoconf_version
29
 #
30
@@ -79,9 +80,9 @@
31
 
32
 PROGRAM=libtool
33
 PACKAGE=libtool
34
-VERSION="2.4 Debian-2.4-2ubuntu1"
35
+VERSION="2.4.2 Debian-2.4.2-1ubuntu1"
36
 TIMESTAMP=""
37
-package_revision=1.3293
38
+package_revision=1.3337
39
 
40
 # Be Bourne compatible
41
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
42
@@ -136,15 +137,10 @@
43
 
44
 : ${CP="cp -f"}
45
 test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
46
-: ${EGREP="/bin/grep -E"}
47
-: ${FGREP="/bin/grep -F"}
48
-: ${GREP="/bin/grep"}
49
-: ${LN_S="ln -s"}
50
 : ${MAKE="make"}
51
 : ${MKDIR="mkdir"}
52
 : ${MV="mv -f"}
53
 : ${RM="rm -f"}
54
-: ${SED="/bin/sed"}
55
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
56
 : ${Xsed="$SED -e 1s/^X//"}
57
 
58
@@ -387,7 +383,7 @@
59
      ;;
60
   *)
61
      save_IFS="$IFS"
62
-     IFS=:
63
+     IFS=${PATH_SEPARATOR-:}
64
      for progdir in $PATH; do
65
        IFS="$save_IFS"
66
        test -x "$progdir/$progname" && break
67
@@ -771,8 +767,8 @@
68
    s*\$LTCFLAGS*'"$LTCFLAGS"'*
69
    s*\$LD*'"$LD"'*
70
    s/\$with_gnu_ld/'"$with_gnu_ld"'/
71
-   s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
72
-   s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
73
+   s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
74
+   s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
75
    p
76
    d
77
      }
78
@@ -1052,6 +1048,7 @@
79
 opt_help=false
80
 opt_help_all=false
81
 opt_silent=:
82
+opt_warning=:
83
 opt_verbose=:
84
 opt_silent=false
85
 opt_verbose=false
86
@@ -1120,6 +1117,10 @@
87
            opt_silent=false
88
 func_append preserve_args " $opt"
89
            ;;
90
+      --no-warning|--no-warn)
91
+           opt_warning=false
92
+func_append preserve_args " $opt"
93
+           ;;
94
       --no-verbose)
95
            opt_verbose=false
96
 func_append preserve_args " $opt"
97
@@ -2059,7 +2060,7 @@
98
     *.cCFSifmso | \
99
     *.ada | *.adb | *.ads | *.asm | \
100
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
101
-    *.fF09? | *.for | *.java | *.obj | *.sx | *.cu | *.cup)
102
+    *.fF09? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
103
       func_xform "$libobj"
104
       libobj=$func_xform_result
105
       ;;
106
@@ -3201,11 +3202,13 @@
107
 
108
       # Set up the ranlib parameters.
109
       oldlib="$destdir/$name"
110
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
111
+      tool_oldlib=$func_to_tool_file_result
112
 
113
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
114
 
115
       if test -n "$stripme" && test -n "$old_striplib"; then
116
-   func_show_eval "$old_striplib $oldlib" 'exit $?'
117
+   func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
118
       fi
119
 
120
       # Do each command in the postinstall commands.
121
@@ -3470,7 +3473,7 @@
122
      # linked before any other PIC object.  But we must not use
123
      # pic_flag when linking with -static.  The problem exists in
124
      # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
125
-     *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
126
+     *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
127
        pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
128
      *-*-hpux*)
129
        pic_flag_for_symtable=" $pic_flag"  ;;
130
@@ -3982,14 +3985,17 @@
131
 # launches target application with the remaining arguments.
132
 func_exec_program ()
133
 {
134
-  for lt_wr_arg
135
-  do
136
-    case \$lt_wr_arg in
137
-    --lt-*) ;;
138
-    *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
139
-    esac
140
-    shift
141
-  done
142
+  case \" \$* \" in
143
+  *\\ --lt-*)
144
+    for lt_wr_arg
145
+    do
146
+      case \$lt_wr_arg in
147
+      --lt-*) ;;
148
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
149
+      esac
150
+      shift
151
+    done ;;
152
+  esac
153
   func_exec_program_core \${1+\"\$@\"}
154
 }
155
 
156
@@ -5057,9 +5063,15 @@
157
 {
158
 EOF
159
        func_emit_wrapper yes |
160
-              $SED -e 's/\(\\"\)/\\\1/g' \
161
-              -e 's/^/  fputs ("/' -e 's/$/\\n", f);/'
162
-
163
+         $SED -n -e '
164
+s/^\(.\{79\}\)\(..*\)/\1\
165
+\2/
166
+h
167
+s/\(\\"\)/\\\1/g
168
+s/$/\\n/
169
+s/\(^\n*\).*/  fputs ("\1", f);/p
170
+g
171
+D'
172
             cat <<"EOF"
173
 }
174
 EOF
175
@@ -5643,7 +5655,8 @@
176
    continue
177
    ;;
178
 
179
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
180
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
181
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
182
    func_append compiler_flags " $arg"
183
    func_append compile_command " $arg"
184
    func_append finalize_command " $arg"
185
@@ -6150,7 +6163,8 @@
186
    lib=
187
    found=no
188
    case $deplib in
189
-   -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
190
+   -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
191
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
192
      if test "$linkmode,$pass" = "prog,link"; then
193
        compile_deplibs="$deplib $compile_deplibs"
194
        finalize_deplibs="$deplib $finalize_deplibs"
195
@@ -6834,7 +6848,7 @@
196
             test "$hardcode_direct_absolute" = no; then
197
        add="$dir/$linklib"
198
          elif test "$hardcode_minus_L" = yes; then
199
-       add_dir="-L$dir"
200
+       add_dir="-L$absdir"
201
        # Try looking first in the location we're being installed to.
202
        if test -n "$inst_prefix_dir"; then
203
          case $libdir in
204
@@ -7319,6 +7333,7 @@
205
      # which has an extra 1 added just for fun
206
      #
207
      case $version_type in
208
+     # correct linux to gnu/linux during the next big refactor
209
      darwin|linux|osf|windows|none)
210
        func_arith $number_major + $number_minor
211
        current=$func_arith_result
212
@@ -7438,7 +7453,7 @@
213
      versuffix="$major.$revision"
214
      ;;
215
 
216
-   linux)
217
+   linux) # correct to gnu/linux during the next big refactor
218
      func_arith $current - $age
219
      major=.$func_arith_result
220
      versuffix="$major.$age.$revision"
221
@@ -8026,6 +8041,11 @@
222
 
223
       # Test again, we may have decided not to build it any more
224
       if test "$build_libtool_libs" = yes; then
225
+   # Remove ${wl} instances when linking with ld.
226
+   # FIXME: should test the right _cmds variable.
227
+   case $archive_cmds in
228
+     *\$LD\ *) wl= ;;
229
+        esac
230
    if test "$hardcode_into_libs" = yes; then
231
      # Hardcode the library paths
232
      hardcode_libdirs=
233
@@ -8056,7 +8076,7 @@
234
        elif test -n "$runpath_var"; then
235
          case "$perm_rpath " in
236
          *" $libdir "*) ;;
237
-         *) func_apped perm_rpath " $libdir" ;;
238
+         *) func_append perm_rpath " $libdir" ;;
239
          esac
240
        fi
241
      done
242
@@ -8064,11 +8084,7 @@
243
      if test -n "$hardcode_libdir_separator" &&
244
         test -n "$hardcode_libdirs"; then
245
        libdir="$hardcode_libdirs"
246
-       if test -n "$hardcode_libdir_flag_spec_ld"; then
247
-         eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
248
-       else
249
-         eval dep_rpath=\"$hardcode_libdir_flag_spec\"
250
-       fi
251
+       eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
252
      fi
253
      if test -n "$runpath_var" && test -n "$perm_rpath"; then
254
        # We should set the runpath_var.
255
@@ -9158,6 +9174,8 @@
256
        esac
257
      done
258
    fi
259
+   func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
260
+   tool_oldlib=$func_to_tool_file_result
261
    eval cmds=\"$old_archive_cmds\"
262
 
263
    func_len " $cmds"
264
@@ -9267,7 +9285,8 @@
265
          *.la)
266
        func_basename "$deplib"
267
        name="$func_basename_result"
268
-       eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
269
+       func_resolve_sysroot "$deplib"
270
+       eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
271
        test -z "$libdir" && \
272
          func_fatal_error "\`$deplib' is not a valid libtool archive"
273
        func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
274
wxsvg-1.1.5.tar.bz2/m4/libtool.m4 -> wxsvg-1.1.9.tar.bz2/m4/libtool.m4 Changed
671
 
1
@@ -1,8 +1,8 @@
2
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
3
 #
4
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
5
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
6
-#                 Inc.
7
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
8
+#                 Foundation, Inc.
9
 #   Written by Gordon Matzigkeit, 1996
10
 #
11
 # This file is free software; the Free Software Foundation gives
12
@@ -11,8 +11,8 @@
13
 
14
 m4_define(_LT_COPYING, dnl
15
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
16
-#                 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
17
-#                 Inc.
18
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
19
+#                 Foundation, Inc.
20
 #   Written by Gordon Matzigkeit, 1996
21
 #
22
 #   This file is part of GNU Libtool.
23
@@ -146,6 +146,8 @@
24
 AC_REQUIRE(_LT_PREPARE_SED_QUOTE_VARS)dnl
25
 AC_REQUIRE(_LT_PROG_ECHO_BACKSLASH)dnl
26
 
27
+_LT_DECL(, PATH_SEPARATOR, 1, The PATH separator for the build system)dnl
28
+dnl
29
 _LT_DECL(, host_alias, 0, The host system)dnl
30
 _LT_DECL(, host, 0)dnl
31
 _LT_DECL(, host_os, 0)dnl
32
@@ -637,7 +639,7 @@
33
 m4_ifset(AC_PACKAGE_VERSION,  AC_PACKAGE_VERSION)
34
 configured by $0, generated by m4_PACKAGE_STRING.
35
 
36
-Copyright (C) 2010 Free Software Foundation, Inc.
37
+Copyright (C) 2011 Free Software Foundation, Inc.
38
 This config.lt script is free software; the Free Software Foundation
39
 gives unlimited permision to copy, distribute and modify it."
40
 
41
@@ -801,6 +803,7 @@
42
 m4_case($1,
43
   C,           _LT_LANG(C),
44
   C++,     _LT_LANG(CXX),
45
+  Go,          _LT_LANG(GO),
46
   Java,        _LT_LANG(GCJ),
47
   Fortran 77,      _LT_LANG(F77),
48
   Fortran,     _LT_LANG(FC),
49
@@ -822,6 +825,31 @@
50
 )# _LT_LANG
51
 
52
 
53
+m4_ifndef(AC_PROG_GO, 
54
+############################################################
55
+# NOTE: This macro has been submitted for inclusion into   #
56
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
57
+#  a released version of Autoconf we should remove this    #
58
+#  macro and use it instead.                               #
59
+############################################################
60
+m4_defun(AC_PROG_GO,
61
+AC_LANG_PUSH(Go)dnl
62
+AC_ARG_VAR(GOC,     Go compiler command)dnl
63
+AC_ARG_VAR(GOFLAGS, Go compiler flags)dnl
64
+_AC_ARG_VAR_LDFLAGS()dnl
65
+AC_CHECK_TOOL(GOC, gccgo)
66
+if test -z "$GOC"; then
67
+  if test -n "$ac_tool_prefix"; then
68
+    AC_CHECK_PROG(GOC, ${ac_tool_prefix}gccgo, ${ac_tool_prefix}gccgo)
69
+  fi
70
+fi
71
+if test -z "$GOC"; then
72
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
73
+fi
74
+)#m4_defun
75
+)#m4_ifndef
76
+
77
+
78
 # _LT_LANG_DEFAULT_CONFIG
79
 # -----------------------
80
 m4_defun(_LT_LANG_DEFAULT_CONFIG,
81
@@ -852,6 +880,10 @@
82
        m4_ifdef(LT_PROG_GCJ,
83
    m4_define(LT_PROG_GCJ, defn(LT_PROG_GCJ)LT_LANG(GCJ))))))
84
 
85
+AC_PROVIDE_IFELSE(AC_PROG_GO,
86
+  LT_LANG(GO),
87
+  m4_define(AC_PROG_GO, defn(AC_PROG_GO)LT_LANG(GO)))
88
+
89
 AC_PROVIDE_IFELSE(LT_PROG_RC,
90
   LT_LANG(RC),
91
   m4_define(LT_PROG_RC, defn(LT_PROG_RC)LT_LANG(RC)))
92
@@ -954,7 +986,13 @@
93
    $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
94
      -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
95
         _lt_result=$?
96
-   if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
97
+   # If there is a non-empty error log, and "single_module"
98
+   # appears in it, assume the flag caused a linker warning
99
+        if test -s conftest.err && $GREP single_module conftest.err; then
100
+     cat conftest.err >&AS_MESSAGE_LOG_FD
101
+   # Otherwise, if the output was created with a 0 exit code from
102
+   # the compiler, it worked.
103
+   elif test -f libconftest.dylib && test $_lt_result -eq 0; then
104
      lt_cv_apple_cc_single_mod=yes
105
    else
106
      cat conftest.err >&AS_MESSAGE_LOG_FD
107
@@ -962,6 +1000,7 @@
108
    rm -rf libconftest.dylib*
109
    rm -f conftest.*
110
       fi)
111
+
112
     AC_CACHE_CHECK(for -exported_symbols_list linker flag,
113
       lt_cv_ld_exported_symbols_list,
114
       lt_cv_ld_exported_symbols_list=no
115
@@ -973,6 +1012,7 @@
116
    lt_cv_ld_exported_symbols_list=no)
117
    LDFLAGS="$save_LDFLAGS"
118
     )
119
+
120
     AC_CACHE_CHECK(for -force_load linker flag,lt_cv_ld_force_load,
121
       lt_cv_ld_force_load=no
122
       cat > conftest.c << _LT_EOF
123
@@ -990,7 +1030,9 @@
124
       echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
125
       $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
126
       _lt_result=$?
127
-      if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
128
+      if test -s conftest.err && $GREP force_load conftest.err; then
129
+   cat conftest.err >&AS_MESSAGE_LOG_FD
130
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
131
    lt_cv_ld_force_load=yes
132
       else
133
    cat conftest.err >&AS_MESSAGE_LOG_FD
134
@@ -1035,8 +1077,8 @@
135
 )
136
 
137
 
138
-# _LT_DARWIN_LINKER_FEATURES
139
-# --------------------------
140
+# _LT_DARWIN_LINKER_FEATURES(TAG)
141
+# ---------------------------------
142
 # Checks for linker and compiler features on darwin
143
 m4_defun(_LT_DARWIN_LINKER_FEATURES,
144
 
145
@@ -1047,6 +1089,8 @@
146
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
147
   if test "$lt_cv_ld_force_load" = "yes"; then
148
     _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\"`'
149
+    m4_case($1, F77, _LT_TAGVAR(compiler_needs_object, $1)=yes,
150
+                  FC,  _LT_TAGVAR(compiler_needs_object, $1)=yes)
151
   else
152
     _LT_TAGVAR(whole_archive_flag_spec, $1)=''
153
   fi
154
@@ -1330,14 +1374,27 @@
155
     CFLAGS="$SAVE_CFLAGS"
156
   fi
157
   ;;
158
-sparc*-*solaris*)
159
+*-*solaris*)
160
   # Find out which ABI we are using.
161
   echo 'int i;' > conftest.$ac_ext
162
   if AC_TRY_EVAL(ac_compile); then
163
     case `/usr/bin/file conftest.o` in
164
     *64-bit*)
165
       case $lt_cv_prog_gnu_ld in
166
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
167
+      yes*)
168
+        case $host in
169
+        i?86-*-solaris*)
170
+          LD="${LD-ld} -m elf_x86_64"
171
+          ;;
172
+        sparc*-*-solaris*)
173
+          LD="${LD-ld} -m elf64_sparc"
174
+          ;;
175
+        esac
176
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
177
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
178
+          LD="${LD-ld}_sol2"
179
+        fi
180
+        ;;
181
       *)
182
    if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
183
      LD="${LD-ld} -64"
184
@@ -1414,13 +1471,13 @@
185
 if test -n "$RANLIB"; then
186
   case $host_os in
187
   openbsd*)
188
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
189
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
190
     ;;
191
   *)
192
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
193
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
194
     ;;
195
   esac
196
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
197
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
198
 fi
199
 
200
 case $host_os in
201
@@ -1600,6 +1657,11 @@
202
     lt_cv_sys_max_cmd_len=196608
203
     ;;
204
 
205
+  os2*)
206
+    # The test takes a long time on OS/2.
207
+    lt_cv_sys_max_cmd_len=8192
208
+    ;;
209
+
210
   osf*)
211
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
212
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
213
@@ -1639,7 +1701,7 @@
214
       # If test is not a shell built-in, we'll probably end up computing a
215
       # maximum length that is only half of the actual maximum length, but
216
       # we can't tell.
217
-      while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
218
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
219
             = "X$teststring$teststring"; } >/dev/null 2>&1 &&
220
          test $i != 17 # 1/2 MB should be enough
221
       do
222
@@ -2185,7 +2247,7 @@
223
 
224
 case $host_os in
225
 aix3*)
226
-  version_type=linux
227
+  version_type=linux # correct to gnu/linux during the next big refactor
228
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
229
   shlibpath_var=LIBPATH
230
 
231
@@ -2194,7 +2256,7 @@
232
   ;;
233
 
234
 aix4-9*)
235
-  version_type=linux
236
+  version_type=linux # correct to gnu/linux during the next big refactor
237
   need_lib_prefix=no
238
   need_version=no
239
   hardcode_into_libs=yes
240
@@ -2259,7 +2321,7 @@
241
   ;;
242
 
243
 bsdi45*)
244
-  version_type=linux
245
+  version_type=linux # correct to gnu/linux during the next big refactor
246
   need_version=no
247
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
248
   soname_spec='${libname}${release}${shared_ext}$major'
249
@@ -2398,7 +2460,7 @@
250
   ;;
251
 
252
 dgux*)
253
-  version_type=linux
254
+  version_type=linux # correct to gnu/linux during the next big refactor
255
   need_lib_prefix=no
256
   need_version=no
257
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
258
@@ -2406,10 +2468,6 @@
259
   shlibpath_var=LD_LIBRARY_PATH
260
   ;;
261
 
262
-freebsd1*)
263
-  dynamic_linker=no
264
-  ;;
265
-
266
 freebsd* | dragonfly*)
267
   # DragonFly does not have aout.  When/if they implement a new
268
   # versioning mechanism, adjust this.
269
@@ -2417,7 +2475,7 @@
270
     objformat=`/usr/bin/objformat`
271
   else
272
     case $host_os in
273
-    freebsd123*) objformat=aout ;;
274
+    freebsd23.*) objformat=aout ;;
275
     *) objformat=elf ;;
276
     esac
277
   fi
278
@@ -2435,7 +2493,7 @@
279
   esac
280
   shlibpath_var=LD_LIBRARY_PATH
281
   case $host_os in
282
-  freebsd2*)
283
+  freebsd2.*)
284
     shlibpath_overrides_runpath=yes
285
     ;;
286
   freebsd3.01* | freebsdelf3.01*)
287
@@ -2455,7 +2513,7 @@
288
   ;;
289
 
290
 gnu*)
291
-  version_type=linux
292
+  version_type=linux # correct to gnu/linux during the next big refactor
293
   need_lib_prefix=no
294
   need_version=no
295
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
296
@@ -2466,7 +2524,7 @@
297
   ;;
298
 
299
 haiku*)
300
-  version_type=linux
301
+  version_type=linux # correct to gnu/linux during the next big refactor
302
   need_lib_prefix=no
303
   need_version=no
304
   dynamic_linker="$host_os runtime_loader"
305
@@ -2527,7 +2585,7 @@
306
   ;;
307
 
308
 interix3-9*)
309
-  version_type=linux
310
+  version_type=linux # correct to gnu/linux during the next big refactor
311
   need_lib_prefix=no
312
   need_version=no
313
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
314
@@ -2543,7 +2601,7 @@
315
     nonstopux*) version_type=nonstopux ;;
316
     *)
317
    if test "$lt_cv_prog_gnu_ld" = yes; then
318
-       version_type=linux
319
+       version_type=linux # correct to gnu/linux during the next big refactor
320
    else
321
        version_type=irix
322
    fi ;;
323
@@ -2580,9 +2638,9 @@
324
   dynamic_linker=no
325
   ;;
326
 
327
-# This must be Linux ELF.
328
+# This must be glibc/ELF.
329
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
330
-  version_type=linux
331
+  version_type=linux # correct to gnu/linux during the next big refactor
332
   need_lib_prefix=no
333
   need_version=no
334
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
335
@@ -2657,7 +2715,7 @@
336
   ;;
337
 
338
 newsos6)
339
-  version_type=linux
340
+  version_type=linux # correct to gnu/linux during the next big refactor
341
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
342
   shlibpath_var=LD_LIBRARY_PATH
343
   shlibpath_overrides_runpath=yes
344
@@ -2726,7 +2784,7 @@
345
   ;;
346
 
347
 solaris*)
348
-  version_type=linux
349
+  version_type=linux # correct to gnu/linux during the next big refactor
350
   need_lib_prefix=no
351
   need_version=no
352
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
353
@@ -2751,7 +2809,7 @@
354
   ;;
355
 
356
 sysv4 | sysv4.3*)
357
-  version_type=linux
358
+  version_type=linux # correct to gnu/linux during the next big refactor
359
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
360
   soname_spec='${libname}${release}${shared_ext}$major'
361
   shlibpath_var=LD_LIBRARY_PATH
362
@@ -2775,7 +2833,7 @@
363
 
364
 sysv4*MP*)
365
   if test -d /usr/nec ;then
366
-    version_type=linux
367
+    version_type=linux # correct to gnu/linux during the next big refactor
368
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
369
     soname_spec='$libname${shared_ext}.$major'
370
     shlibpath_var=LD_LIBRARY_PATH
371
@@ -2806,7 +2864,7 @@
372
 
373
 tpf*)
374
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
375
-  version_type=linux
376
+  version_type=linux # correct to gnu/linux during the next big refactor
377
   need_lib_prefix=no
378
   need_version=no
379
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
380
@@ -2816,7 +2874,7 @@
381
   ;;
382
 
383
 uts4*)
384
-  version_type=linux
385
+  version_type=linux # correct to gnu/linux during the next big refactor
386
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
387
   soname_spec='${libname}${release}${shared_ext}$major'
388
   shlibpath_var=LD_LIBRARY_PATH
389
@@ -3238,7 +3296,7 @@
390
   lt_cv_deplibs_check_method=pass_all
391
   ;;
392
 
393
-# This must be Linux ELF.
394
+# This must be glibc/ELF.
395
 linux* | k*bsd*-gnu | kopensolaris*-gnu)
396
   lt_cv_deplibs_check_method=pass_all
397
   ;;
398
@@ -3658,6 +3716,7 @@
399
     # which start with @ or ?.
400
     lt_cv_sys_global_symbol_pipe="$AWK '"\
401
 "     {last_section=section; section=\$ 3};"\
402
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hidei};"\
403
 "     /Section length .*#relocs.*(pick any)/{hidelast_section=1};"\
404
 "     \$ 0!~/External *\|/{next};"\
405
 "     / 0+ UNDEF /{next}; / UNDEF \(^|\)*()/{next};"\
406
@@ -4242,7 +4301,9 @@
407
     case $cc_basename in
408
     nvcc*) # Cuda Compiler Driver 2.2
409
       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
410
-      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC'
411
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
412
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
413
+      fi
414
       ;;
415
     esac
416
   else
417
@@ -4334,18 +4395,33 @@
418
    ;;
419
       *)
420
    case `$CC -V 2>&1 | sed 5q` in
421
-   *Sun\ F* | *Sun*Fortran*)
422
+   *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ 1-7.* | *Sun*Fortran*\ 8.0-3*)
423
      # Sun Fortran 8.3 passes all unrecognized flags to the linker
424
      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
425
      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
426
      _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
427
      ;;
428
+   *Sun\ F* | *Sun*Fortran*)
429
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
430
+     _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
431
+     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
432
+     ;;
433
    *Sun\ C*)
434
      # Sun C 5.9
435
      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
436
      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
437
      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
438
      ;;
439
+        *Intel*\ CF*Compiler*)
440
+     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
441
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
442
+     _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
443
+     ;;
444
+   *Portland\ Group*)
445
+     _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
446
+     _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
447
+     _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
448
+     ;;
449
    esac
450
    ;;
451
       esac
452
@@ -4505,7 +4581,9 @@
453
     ;;
454
   cygwin* | mingw* | cegcc*)
455
     case $cc_basename in
456
-    cl*) ;;
457
+    cl*)
458
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
459
+      ;;
460
     *)
461
       _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'
462
       _LT_TAGVAR(exclude_expsyms, $1)='_+GLOBAL_OFFSET_TABLE_|_+GLOBAL__FID_.*|_+head_A-Za-z0-9_+_dll|A-Za-z0-9_+_dll_iname'
463
@@ -4533,7 +4611,6 @@
464
   _LT_TAGVAR(hardcode_direct, $1)=no
465
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
466
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
467
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
468
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
469
   _LT_TAGVAR(hardcode_minus_L, $1)=no
470
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
471
@@ -4787,8 +4864,7 @@
472
    xlf* | bgf* | bgxlf* | mpixlf*)
473
      # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
474
      _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
475
-     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
476
-     _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
477
+     _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
478
      _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
479
      if test "x$supports_anon_versioning" = xyes; then
480
        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
481
@@ -5084,6 +5160,7 @@
482
    # The linker will not automatically build a static lib if we build a DLL.
483
    # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
484
    _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
485
+   _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
486
    _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'
487
    # Don't use ranlib
488
    _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
489
@@ -5130,10 +5207,6 @@
490
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
491
       ;;
492
 
493
-    freebsd1*)
494
-      _LT_TAGVAR(ld_shlibs, $1)=no
495
-      ;;
496
-
497
     # FreeBSD 2.2.012 allows us to include c++rt0.o to get C++ constructor
498
     # support.  Future versions do this automatically, but an explicit c++rt0.o
499
     # does not break anything, and helps significantly (at the cost of a little
500
@@ -5146,7 +5219,7 @@
501
       ;;
502
 
503
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
504
-    freebsd2*)
505
+    freebsd2.*)
506
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
507
       _LT_TAGVAR(hardcode_direct, $1)=yes
508
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
509
@@ -5185,7 +5258,6 @@
510
       fi
511
       if test "$with_gnu_ld" = no; then
512
    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
513
-   _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
514
    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
515
    _LT_TAGVAR(hardcode_direct, $1)=yes
516
    _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
517
@@ -5627,9 +5699,6 @@
518
 _LT_TAGDECL(, hardcode_libdir_flag_spec, 1,
519
     Flag to hardcode $libdir into a binary during linking.
520
     This must work even if $libdir does not exist)
521
-_LT_TAGDECL(, hardcode_libdir_flag_spec_ld, 1,
522
-    If ld is used when linking, flag to hardcode $libdir into a binary
523
-    during linking.  This must work even if $libdir does not exist)
524
 _LT_TAGDECL(, hardcode_libdir_separator, 1,
525
     Whether we need a single "-rpath" flag with a separated argument)
526
 _LT_TAGDECL(, hardcode_direct, 0,
527
@@ -5787,7 +5856,6 @@
528
 _LT_TAGVAR(hardcode_direct, $1)=no
529
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
530
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
531
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
532
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
533
 _LT_TAGVAR(hardcode_minus_L, $1)=no
534
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
535
@@ -6157,7 +6225,7 @@
536
         esac
537
         ;;
538
 
539
-      freebsd12*)
540
+      freebsd2.*)
541
         # C++ shared libraries reported to be fairly broken before
542
    # switch to ELF
543
         _LT_TAGVAR(ld_shlibs, $1)=no
544
@@ -6918,12 +6986,18 @@
545
   }
546
 };
547
 _LT_EOF
548
+, $1, GO, cat > conftest.$ac_ext <<_LT_EOF
549
+package foo
550
+func foo() {
551
+}
552
+_LT_EOF
553
 )
554
 
555
 _lt_libdeps_save_CFLAGS=$CFLAGS
556
 case "$CC $CFLAGS " in #(
557
 *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
558
 *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
559
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
560
 esac
561
 
562
 dnl Parse the compiler output and extract the necessary
563
@@ -7120,7 +7194,6 @@
564
 _LT_TAGVAR(hardcode_direct, $1)=no
565
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
566
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
567
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
568
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
569
 _LT_TAGVAR(hardcode_minus_L, $1)=no
570
 _LT_TAGVAR(hardcode_automatic, $1)=no
571
@@ -7253,7 +7326,6 @@
572
 _LT_TAGVAR(hardcode_direct, $1)=no
573
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
574
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
575
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
576
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
577
 _LT_TAGVAR(hardcode_minus_L, $1)=no
578
 _LT_TAGVAR(hardcode_automatic, $1)=no
579
@@ -7440,6 +7512,77 @@
580
 )# _LT_LANG_GCJ_CONFIG
581
 
582
 
583
+# _LT_LANG_GO_CONFIG(TAG)
584
+# --------------------------
585
+# Ensure that the configuration variables for the GNU Go compiler
586
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
587
+# to write the compiler configuration to `libtool'.
588
+m4_defun(_LT_LANG_GO_CONFIG,
589
+AC_REQUIRE(LT_PROG_GO)dnl
590
+AC_LANG_SAVE
591
+
592
+# Source file extension for Go test sources.
593
+ac_ext=go
594
+
595
+# Object file extension for compiled Go test sources.
596
+objext=o
597
+_LT_TAGVAR(objext, $1)=$objext
598
+
599
+# Code to be used in simple compile tests
600
+lt_simple_compile_test_code="package main; func main() { }"
601
+
602
+# Code to be used in simple link tests
603
+lt_simple_link_test_code='package main; func main() { }'
604
+
605
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
606
+_LT_TAG_COMPILER
607
+
608
+# save warnings/boilerplate of simple test code
609
+_LT_COMPILER_BOILERPLATE
610
+_LT_LINKER_BOILERPLATE
611
+
612
+# Allow CC to be a program name with arguments.
613
+lt_save_CC=$CC
614
+lt_save_CFLAGS=$CFLAGS
615
+lt_save_GCC=$GCC
616
+GCC=yes
617
+CC=${GOC-"gccgo"}
618
+CFLAGS=$GOFLAGS
619
+compiler=$CC
620
+_LT_TAGVAR(compiler, $1)=$CC
621
+_LT_TAGVAR(LD, $1)="$LD"
622
+_LT_CC_BASENAME($compiler)
623
+
624
+# Go did not exist at the time GCC didn't implicitly link libc in.
625
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
626
+
627
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
628
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
629
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
630
+
631
+## CAVEAT EMPTOR:
632
+## There is no encapsulation within the following macros, do not change
633
+## the running order or otherwise move them around unless you know exactly
634
+## what you are doing...
635
+if test -n "$compiler"; then
636
+  _LT_COMPILER_NO_RTTI($1)
637
+  _LT_COMPILER_PIC($1)
638
+  _LT_COMPILER_C_O($1)
639
+  _LT_COMPILER_FILE_LOCKS($1)
640
+  _LT_LINKER_SHLIBS($1)
641
+  _LT_LINKER_HARDCODE_LIBPATH($1)
642
+
643
+  _LT_CONFIG($1)
644
+fi
645
+
646
+AC_LANG_RESTORE
647
+
648
+GCC=$lt_save_GCC
649
+CC=$lt_save_CC
650
+CFLAGS=$lt_save_CFLAGS
651
+)# _LT_LANG_GO_CONFIG
652
+
653
+
654
 # _LT_LANG_RC_CONFIG(TAG)
655
 # -------------------------
656
 # Ensure that the configuration variables for the Windows resource compiler
657
@@ -7509,6 +7652,13 @@
658
 dnl AC_DEFUN(LT_AC_PROG_GCJ, )
659
 
660
 
661
+# LT_PROG_GO
662
+# ----------
663
+AC_DEFUN(LT_PROG_GO,
664
+AC_CHECK_TOOL(GOC, gccgo,)
665
+)
666
+
667
+
668
 # LT_PROG_RC
669
 # ----------
670
 AC_DEFUN(LT_PROG_RC,
671
wxsvg-1.1.5.tar.bz2/m4/ltoptions.m4 -> wxsvg-1.1.9.tar.bz2/m4/ltoptions.m4 Changed
28
 
1
@@ -326,9 +326,24 @@
2
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
3
 m4_define(_LT_WITH_PIC,
4
 AC_ARG_WITH(pic,
5
-    AS_HELP_STRING(--with-pic,
6
+    AS_HELP_STRING(--with-pic@<:@=PKGS@:>@,
7
    try to use only PIC/non-PIC objects @<:@default=use both@:>@),
8
-    pic_mode="$withval",
9
+    lt_p=${PACKAGE-default}
10
+    case $withval in
11
+    yes|no) pic_mode=$withval ;;
12
+    *)
13
+      pic_mode=default
14
+      # Look at the argument we got.  We use all the common list separators.
15
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
16
+      for lt_pkg in $withval; do
17
+   IFS="$lt_save_ifs"
18
+   if test "X$lt_pkg" = "X$lt_p"; then
19
+     pic_mode=yes
20
+   fi
21
+      done
22
+      IFS="$lt_save_ifs"
23
+      ;;
24
+    esac,
25
     pic_mode=default)
26
 
27
 test -z "$pic_mode" && pic_mode=m4_default($1, default)
28
wxsvg-1.1.5.tar.bz2/m4/ltversion.m4 -> wxsvg-1.1.9.tar.bz2/m4/ltversion.m4 Changed
22
 
1
@@ -9,15 +9,15 @@
2
 
3
 # @configure_input@
4
 
5
-# serial 3293 ltversion.m4
6
+# serial 3337 ltversion.m4
7
 # This file is part of GNU Libtool
8
 
9
-m4_define(LT_PACKAGE_VERSION, 2.4)
10
-m4_define(LT_PACKAGE_REVISION, 1.3293)
11
+m4_define(LT_PACKAGE_VERSION, 2.4.2)
12
+m4_define(LT_PACKAGE_REVISION, 1.3337)
13
 
14
 AC_DEFUN(LTVERSION_VERSION,
15
-macro_version='2.4'
16
-macro_revision='1.3293'
17
+macro_version='2.4.2'
18
+macro_revision='1.3337'
19
 _LT_DECL(, macro_version, 0, Which release of libtool.m4 was used?)
20
 _LT_DECL(, macro_revision, 0)
21
 )
22
wxsvg-1.1.5.tar.bz2/scripts/genGetAttributes.py -> wxsvg-1.1.9.tar.bz2/scripts/genGetAttributes.py Changed
21
 
1
@@ -4,7 +4,7 @@
2
 ##              -> GetAttributes() methods for all svg elements
3
 ## Author:      Alex Thuering
4
 ## Created:     2005/09/27
5
-## RCS-ID:      $Id: genGetAttributes.py,v 1.7 2011/11/24 00:01:44 ntalex Exp $
6
+## RCS-ID:      $Id: genGetAttributes.py,v 1.9 2012/01/13 18:57:10 ntalex Exp $
7
 ## Copyright:   (c) 2005 Alex Thuering
8
 ## Notes:      some modules adapted from svgl project
9
 ##############################################################################
10
@@ -94,7 +94,9 @@
11
         if len(check)>0:
12
             func_body = func_body + '  if (%s)\n  '%check
13
         func_body = func_body + '  attrs.Add(wxT("%s"), %s);\n'%(entity_name, get_attr)
14
-
15
+        if classdecl.name in customParser:
16
+            func_body = func_body + '  attrs.Add(GetCustomAttributes());\n'
17
+       
18
     for inh in classdecl.inherits:
19
         if inh in "Element", "events::EventTarget", "events::DocumentEvent",
20
                    "css::ViewCSS", "css::DocumentCSS", "css::CSSValue",
21
wxsvg-1.1.5.tar.bz2/scripts/generate.py -> wxsvg-1.1.9.tar.bz2/scripts/generate.py Changed
27
 
1
@@ -3,7 +3,7 @@
2
 ## Purpose:     generates the most headers from idl, but with some changes
3
 ## Author:      Alex Thuering
4
 ## Created:     2005/01/19
5
-## RCS-ID:      $Id: generate.py,v 1.20 2011/06/23 11:27:04 ntalex Exp $
6
+## RCS-ID:      $Id: generate.py,v 1.21 2012/01/08 02:42:14 ntalex Exp $
7
 ## Copyright:   (c) 2005 Alex Thuering
8
 ## Notes:       some modules adapted from svgl project
9
 ##############################################################################
10
@@ -472,6 +472,7 @@
11
                 protected = protected + '    bool HasCustomAttribute(const wxString& name);\n';
12
                 protected = protected + '    wxString GetCustomAttribute(const wxString& name);\n';
13
                 protected = protected + '    bool SetCustomAttribute(const wxString& name, const wxString& value);\n';
14
+                protected = protected + '    wxSvgXmlAttrHash GetCustomAttributes() const;\n';
15
 
16
         element_string=None
17
         if mapDtdIdl.elements_idl_dtd.has_key(classdecl):
18
@@ -569,7 +570,7 @@
19
 // Purpose:     
20
 // Author:      Alex Thuering
21
 // Created:     2005/04/29
22
-// RCS-ID:      $Id: generate.py,v 1.20 2011/06/23 11:27:04 ntalex Exp $
23
+// RCS-ID:      $Id: generate.py,v 1.21 2012/01/08 02:42:14 ntalex Exp $
24
 // Copyright:   (c) 2005 Alex Thuering
25
 // Licence:     wxWindows licence
26
 /////////////////////////////////////////////////////////////////////////////
27
wxsvg-1.1.5.tar.bz2/scripts/interfaces.py -> wxsvg-1.1.9.tar.bz2/scripts/interfaces.py Changed
28
 
1
@@ -3,7 +3,7 @@
2
 ## Purpose:     
3
 ## Author:      Alex Thuering
4
 ## Created:     2005/01/19
5
-## RCS-ID:      $Id: interfaces.py,v 1.31 2011/11/23 23:07:15 ntalex Exp $
6
+## RCS-ID:      $Id: interfaces.py,v 1.32 2012/04/01 20:36:25 ntalex Exp $
7
 ## Copyright:   (c) 2005 Alex Thuering
8
 ## Notes:      some modules adapted from svgl project
9
 ##############################################################################
10
@@ -379,6 +379,17 @@
11
 inter.include_methods.append('    inline void SetX(const wxSVGLength& n) { wxSVGLengthList list; list.Add(n); SetX(list); }\n')
12
 inter.include_methods.append('    inline void SetY(const wxSVGLength& n) { wxSVGLengthList list; list.Add(n); SetY(list); }\n')
13
 
14
+# SVGRadialGradientElement
15
+inter = interface()
16
+interfaces"SVGRadialGradientElement"=inter
17
+inter.include_methods.append('''
18
+    double GetQualifiedR() const;
19
+    double GetQualifiedCx() const;
20
+    double GetQualifiedCy() const;
21
+    double GetQualifiedFx() const;
22
+    double GetQualifiedFy() const;\n
23
+''')
24
+
25
 # SVGDocument
26
 inter = interface()
27
 interfaces"SVGDocument"=inter
28
wxsvg-1.1.5.tar.bz2/src/Elements_GetAttributes.cpp -> wxsvg-1.1.9.tar.bz2/src/Elements_GetAttributes.cpp Changed
20
 
1
@@ -571,8 +571,10 @@
2
   wxSvgXmlAttrHash attrs;
3
   if (!m_className.GetBaseVal().IsEmpty())
4
     attrs.Add(wxT("class"), m_className.GetBaseVal());
5
+  attrs.Add(GetCustomAttributes());
6
   if (!m_style.empty())
7
     attrs.Add(wxT("style"), m_style.GetCSSText());
8
+  attrs.Add(GetCustomAttributes());
9
   return attrs;
10
 }
11
 
12
@@ -1395,6 +1397,7 @@
13
   wxSvgXmlAttrHash attrs;
14
   if (!m_in1.GetBaseVal().IsEmpty())
15
     attrs.Add(wxT("in"), m_in1.GetBaseVal());
16
+  attrs.Add(GetCustomAttributes());
17
   attrs.Add(wxSVGElement::GetAttributes());
18
   attrs.Add(wxSVGFilterPrimitiveStandardAttributes::GetAttributes());
19
   return attrs;
20
wxsvg-1.1.5.tar.bz2/src/Makefile.am -> wxsvg-1.1.9.tar.bz2/src/Makefile.am Changed
30
 
1
@@ -21,8 +21,8 @@
2
 TEXT_LIB = 
3
 endif
4
 
5
-if USE_FFMPEG
6
-FFMPEG_SRC = mediadec_ffmpeg.cpp
7
+if USE_LIBAV
8
+LIBAV_SRC = mediadec_ffmpeg.cpp
9
 endif
10
 
11
 SUBDIRS = svgxml $(TEXT_DIR) $(RENDER_DIR)
12
@@ -32,7 +32,7 @@
13
   SVGAnimationElement.cpp SVGCircleElement.cpp SVGEllipseElement.cpp\
14
   SVGFEGaussianBlurElement.cpp SVGFilterElement.cpp SVGImageElement.cpp\
15
   SVGLineElement.cpp SVGLocatable.cpp SVGMarkerElement.cpp SVGPathElement.cpp\
16
-  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp\
17
+  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp SVGRadialGradientElement.cpp\
18
   SVGSVGElement.cpp SVGTextContentElement.cpp SVGTextElement.cpp\
19
   SVGUseElement.cpp SVGVideoElement.cpp\
20
   SVGAngle.cpp SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp\
21
@@ -44,7 +44,7 @@
22
   Elements_CopyConstructors.cpp Elements_HasAttribute.cpp\
23
   Elements_GetAttribute.cpp Elements_GetAttributes.cpp Elements_SetAttribute.cpp\
24
   CSSValue.cpp CSSStyleDeclaration.cpp\
25
-  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(FFMPEG_SRC)
26
+  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(LIBAV_SRC)
27
 
28
 libwxsvg_la_LIBADD = svgxml/libwxsvgxml.la $(RENDER_LIB) $(TEXT_LIB)
29
 libwxsvg_la_LDFLAGS = -no-undefined -version-info @LIBRARY_VERSION@
30
wxsvg-1.1.5.tar.bz2/src/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/Makefile.in Changed
170
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -65,6 +65,12 @@
15
 am__base_list = \
16
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
17
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
18
+am__uninstall_files_from_dir = { \
19
+  test -z "$$files" \
20
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
21
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
22
+         $(am__cd) "$$dir" && rm -f $$files; }; \
23
+  }
24
 am__installdirs = "$(DESTDIR)$(libdir)"
25
 LTLIBRARIES = $(lib_LTLIBRARIES)
26
 @USE_FREETYPE_TRUE@am__DEPENDENCIES_1 = freetype/libwxsvg_freetype.la
27
@@ -76,31 +82,32 @@
28
    SVGFilterElement.cpp SVGImageElement.cpp SVGLineElement.cpp \
29
    SVGLocatable.cpp SVGMarkerElement.cpp SVGPathElement.cpp \
30
    SVGPolylineElement.cpp SVGPolygonElement.cpp \
31
-   SVGRectElement.cpp SVGSVGElement.cpp SVGTextContentElement.cpp \
32
-   SVGTextElement.cpp SVGUseElement.cpp SVGVideoElement.cpp \
33
-   SVGAngle.cpp SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp \
34
-   SVGMatrix.cpp SVGPaint.cpp SVGPoint.cpp \
35
-   SVGPreserveAspectRatio.cpp SVGRect.cpp SVGTests.cpp \
36
-   SVGTransform.cpp SVGFitToViewBox.cpp SVGStylable.cpp \
37
-   SVGTransformable.cpp SVGElementInstanceList.cpp \
38
-   SVGLengthList.cpp SVGNumberList.cpp SVGPathSegList.cpp \
39
-   SVGPointList.cpp SVGStringList.cpp SVGTransformList.cpp \
40
-   Elements_CopyConstructors.cpp Elements_HasAttribute.cpp \
41
-   Elements_GetAttribute.cpp Elements_GetAttributes.cpp \
42
-   Elements_SetAttribute.cpp CSSValue.cpp CSSStyleDeclaration.cpp \
43
-   SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp \
44
-   mediadec_ffmpeg.cpp
45
-@USE_FFMPEG_TRUE@am__objects_1 = mediadec_ffmpeg.lo
46
+   SVGRectElement.cpp SVGRadialGradientElement.cpp \
47
+   SVGSVGElement.cpp SVGTextContentElement.cpp SVGTextElement.cpp \
48
+   SVGUseElement.cpp SVGVideoElement.cpp SVGAngle.cpp \
49
+   SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp SVGMatrix.cpp \
50
+   SVGPaint.cpp SVGPoint.cpp SVGPreserveAspectRatio.cpp \
51
+   SVGRect.cpp SVGTests.cpp SVGTransform.cpp SVGFitToViewBox.cpp \
52
+   SVGStylable.cpp SVGTransformable.cpp \
53
+   SVGElementInstanceList.cpp SVGLengthList.cpp SVGNumberList.cpp \
54
+   SVGPathSegList.cpp SVGPointList.cpp SVGStringList.cpp \
55
+   SVGTransformList.cpp Elements_CopyConstructors.cpp \
56
+   Elements_HasAttribute.cpp Elements_GetAttribute.cpp \
57
+   Elements_GetAttributes.cpp Elements_SetAttribute.cpp \
58
+   CSSValue.cpp CSSStyleDeclaration.cpp SVGCanvas.cpp \
59
+   SVGCanvasItem.cpp NodeList.cpp mediadec_ffmpeg.cpp
60
+@USE_LIBAV_TRUE@am__objects_1 = mediadec_ffmpeg.lo
61
 am_libwxsvg_la_OBJECTS = SVGDocument.lo svgctrl.lo imagsvg.lo \
62
    SVGAnimationElement.lo SVGCircleElement.lo \
63
    SVGEllipseElement.lo SVGFEGaussianBlurElement.lo \
64
    SVGFilterElement.lo SVGImageElement.lo SVGLineElement.lo \
65
    SVGLocatable.lo SVGMarkerElement.lo SVGPathElement.lo \
66
    SVGPolylineElement.lo SVGPolygonElement.lo SVGRectElement.lo \
67
-   SVGSVGElement.lo SVGTextContentElement.lo SVGTextElement.lo \
68
-   SVGUseElement.lo SVGVideoElement.lo SVGAngle.lo SVGColor.lo \
69
-   GetSVGDocument.lo SVGLength.lo SVGMatrix.lo SVGPaint.lo \
70
-   SVGPoint.lo SVGPreserveAspectRatio.lo SVGRect.lo SVGTests.lo \
71
+   SVGRadialGradientElement.lo SVGSVGElement.lo \
72
+   SVGTextContentElement.lo SVGTextElement.lo SVGUseElement.lo \
73
+   SVGVideoElement.lo SVGAngle.lo SVGColor.lo GetSVGDocument.lo \
74
+   SVGLength.lo SVGMatrix.lo SVGPaint.lo SVGPoint.lo \
75
+   SVGPreserveAspectRatio.lo SVGRect.lo SVGTests.lo \
76
    SVGTransform.lo SVGFitToViewBox.lo SVGStylable.lo \
77
    SVGTransformable.lo SVGElementInstanceList.lo SVGLengthList.lo \
78
    SVGNumberList.lo SVGPathSegList.lo SVGPointList.lo \
79
@@ -198,8 +205,6 @@
80
 ECHO_T = @ECHO_T@
81
 EGREP = @EGREP@
82
 EXEEXT = @EXEEXT@
83
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
84
-FFMPEG_LIBS = @FFMPEG_LIBS@
85
 FGREP = @FGREP@
86
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
87
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
88
@@ -219,6 +224,8 @@
89
 LIBART_CFLAGS = @LIBART_CFLAGS@
90
 LIBART_CONFIG = @LIBART_CONFIG@
91
 LIBART_LIBS = @LIBART_LIBS@
92
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
93
+LIBAV_LIBS = @LIBAV_LIBS@
94
 LIBOBJS = @LIBOBJS@
95
 LIBRARY_VERSION = @LIBRARY_VERSION@
96
 LIBS = @LIBS@
97
@@ -266,6 +273,9 @@
98
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
99
 WX_RESCOMP = @WX_RESCOMP@
100
 WX_VERSION = @WX_VERSION@
101
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
102
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
103
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
104
 abs_builddir = @abs_builddir@
105
 abs_srcdir = @abs_srcdir@
106
 abs_top_builddir = @abs_top_builddir@
107
@@ -329,14 +339,14 @@
108
 @USE_FREETYPE_TRUE@TEXT_DIR = freetype
109
 @USE_FREETYPE_FALSE@TEXT_LIB = 
110
 @USE_FREETYPE_TRUE@TEXT_LIB = freetype/libwxsvg_freetype.la
111
-@USE_FFMPEG_TRUE@FFMPEG_SRC = mediadec_ffmpeg.cpp
112
+@USE_LIBAV_TRUE@LIBAV_SRC = mediadec_ffmpeg.cpp
113
 SUBDIRS = svgxml $(TEXT_DIR) $(RENDER_DIR)
114
 lib_LTLIBRARIES = libwxsvg.la
115
 libwxsvg_la_SOURCES = SVGDocument.cpp svgctrl.cpp imagsvg.cpp\
116
   SVGAnimationElement.cpp SVGCircleElement.cpp SVGEllipseElement.cpp\
117
   SVGFEGaussianBlurElement.cpp SVGFilterElement.cpp SVGImageElement.cpp\
118
   SVGLineElement.cpp SVGLocatable.cpp SVGMarkerElement.cpp SVGPathElement.cpp\
119
-  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp\
120
+  SVGPolylineElement.cpp SVGPolygonElement.cpp SVGRectElement.cpp SVGRadialGradientElement.cpp\
121
   SVGSVGElement.cpp SVGTextContentElement.cpp SVGTextElement.cpp\
122
   SVGUseElement.cpp SVGVideoElement.cpp\
123
   SVGAngle.cpp SVGColor.cpp GetSVGDocument.cpp SVGLength.cpp\
124
@@ -348,7 +358,7 @@
125
   Elements_CopyConstructors.cpp Elements_HasAttribute.cpp\
126
   Elements_GetAttribute.cpp Elements_GetAttributes.cpp Elements_SetAttribute.cpp\
127
   CSSValue.cpp CSSStyleDeclaration.cpp\
128
-  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(FFMPEG_SRC)
129
+  SVGCanvas.cpp SVGCanvasItem.cpp NodeList.cpp $(LIBAV_SRC)
130
 
131
 libwxsvg_la_LIBADD = svgxml/libwxsvgxml.la $(RENDER_LIB) $(TEXT_LIB)
132
 libwxsvg_la_LDFLAGS = -no-undefined -version-info @LIBRARY_VERSION@
133
@@ -418,7 +428,7 @@
134
      echo "rm -f \"$${dir}/so_locations\""; \
135
      rm -f "$${dir}/so_locations"; \
136
    done
137
-libwxsvg.la: $(libwxsvg_la_OBJECTS) $(libwxsvg_la_DEPENDENCIES) 
138
+libwxsvg.la: $(libwxsvg_la_OBJECTS) $(libwxsvg_la_DEPENDENCIES) $(EXTRA_libwxsvg_la_DEPENDENCIES) 
139
    $(libwxsvg_la_LINK) -rpath $(libdir) $(libwxsvg_la_OBJECTS) $(libwxsvg_la_LIBADD) $(LIBS)
140
 
141
 mostlyclean-compile:
142
@@ -464,6 +474,7 @@
143
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGPolygonElement.Plo@am__quote@
144
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGPolylineElement.Plo@am__quote@
145
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGPreserveAspectRatio.Plo@am__quote@
146
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGRadialGradientElement.Plo@am__quote@
147
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGRect.Plo@am__quote@
148
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGRectElement.Plo@am__quote@
149
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SVGSVGElement.Plo@am__quote@
150
@@ -719,10 +730,15 @@
151
 
152
 installcheck: installcheck-recursive
153
 install-strip:
154
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
155
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
156
-     `test -z '$(STRIP)' || \
157
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
158
+   if test -z '$(STRIP)'; then \
159
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
160
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
161
+         install; \
162
+   else \
163
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
164
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
165
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
166
+   fi
167
 mostlyclean-generic:
168
 
169
 clean-generic:
170
wxsvg-1.1.5.tar.bz2/src/SVGCanvas.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGCanvas.cpp Changed
149
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     wxSVGCanvas - Base class for SVG renders (backends)
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/04
5
-// RCS-ID:      $Id: SVGCanvas.cpp,v 1.16 2011/11/23 22:15:16 ntalex Exp $
6
+// RCS-ID:      $Id: SVGCanvas.cpp,v 1.19 2012/04/09 11:44:50 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -246,7 +246,7 @@
11
            wxSVGImageElement* imgElem1 = (wxSVGImageElement*) elem1;
12
            if (imgElem1->GetHref().GetAnimVal().length()) {
13
                if (imgElem1->GetCanvasItem() == NULL
14
-                       || ((wxSVGCanvasImage*) imgElem1->GetCanvasItem())->m_href != imgElem1->GetHref())
15
+                       || ((wxSVGCanvasImage*) imgElem1->GetCanvasItem())->m_href != imgElem1->GetHref().GetAnimVal())
16
                    imgElem1->SetCanvasItem(CreateItem(imgElem1));
17
                ((wxSVGImageElement*) elem2)->SetCanvasItem(CreateItem(imgElem1));
18
            }
19
@@ -255,7 +255,7 @@
20
            wxSVGVideoElement* vElem1 = (wxSVGVideoElement*) elem1;
21
            if (vElem1->GetHref().GetAnimVal().length()) {
22
                if (vElem1->GetCanvasItem() == NULL
23
-                       || ((wxSVGCanvasVideo*) vElem1->GetCanvasItem())->m_href != vElem1->GetHref())
24
+                       || ((wxSVGCanvasVideo*) vElem1->GetCanvasItem())->m_href != vElem1->GetHref().GetAnimVal())
25
                    vElem1->SetCanvasItem(CreateItem(vElem1));
26
                ((wxSVGVideoElement*) elem2)->SetCanvasItem(CreateItem(vElem1));
27
            }
28
@@ -276,6 +276,8 @@
29
    switch (elem->GetDtd()) {
30
    case wxSVG_SVG_ELEMENT: {
31
        wxSVGSVGElement* element = (wxSVGSVGElement*) elem;
32
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
33
+           break;
34
        if (element->GetWidth().GetAnimVal().GetUnitType() == wxSVG_LENGTHTYPE_UNKNOWN)
35
            ((wxSVGAnimatedLength&) element->GetWidth()).SetAnimVal( wxSVGLength(wxSVG_LENGTHTYPE_PERCENTAGE, 100));
36
        if (element->GetHeight().GetAnimVal().GetUnitType() == wxSVG_LENGTHTYPE_UNKNOWN)
37
@@ -294,6 +296,8 @@
38
    }
39
    case wxSVG_G_ELEMENT: {
40
        wxSVGGElement* element = (wxSVGGElement*) elem;
41
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
42
+           break;
43
        element->UpdateMatrix(matrix);
44
        style.Add(element->GetStyle());
45
        RenderChilds(elem, rect, &matrix, &style, ownerSVGElement, viewportElement);
46
@@ -301,6 +305,8 @@
47
    }
48
    case wxSVG_LINE_ELEMENT: {
49
        wxSVGLineElement* element = (wxSVGLineElement*) elem;
50
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
51
+           break;
52
        element->UpdateMatrix(matrix);
53
        style.Add(element->GetStyle());
54
        DrawLine(element, &matrix, &style);
55
@@ -308,6 +314,8 @@
56
    }
57
    case wxSVG_POLYLINE_ELEMENT: {
58
        wxSVGPolylineElement* element = (wxSVGPolylineElement*) elem;
59
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
60
+           break;
61
        element->UpdateMatrix(matrix);
62
        style.Add(element->GetStyle());
63
        DrawPolyline(element, &matrix, &style);
64
@@ -315,6 +323,8 @@
65
    }
66
    case wxSVG_POLYGON_ELEMENT: {
67
        wxSVGPolygonElement* element = (wxSVGPolygonElement*) elem;
68
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
69
+           break;
70
        element->UpdateMatrix(matrix);
71
        style.Add(element->GetStyle());
72
        DrawPolygon(element, &matrix, &style);
73
@@ -322,6 +332,8 @@
74
    }
75
    case wxSVG_RECT_ELEMENT: {
76
        wxSVGRectElement* element = (wxSVGRectElement*) elem;
77
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
78
+           break;
79
        element->UpdateMatrix(matrix);
80
        style.Add(element->GetStyle());
81
        DrawRect(element, &matrix, &style);
82
@@ -329,6 +341,8 @@
83
    }
84
    case wxSVG_CIRCLE_ELEMENT: {
85
        wxSVGCircleElement* element = (wxSVGCircleElement*) elem;
86
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
87
+           break;
88
        element->UpdateMatrix(matrix);
89
        style.Add(element->GetStyle());
90
        DrawCircle(element, &matrix, &style);
91
@@ -336,6 +350,8 @@
92
    }
93
    case wxSVG_ELLIPSE_ELEMENT: {
94
        wxSVGEllipseElement* element = (wxSVGEllipseElement*) elem;
95
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
96
+           break;
97
        element->UpdateMatrix(matrix);
98
        style.Add(element->GetStyle());
99
        DrawEllipse(element, &matrix, &style);
100
@@ -343,6 +359,8 @@
101
    }
102
    case wxSVG_PATH_ELEMENT: {
103
        wxSVGPathElement* element = (wxSVGPathElement*) elem;
104
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
105
+           break;
106
        element->UpdateMatrix(matrix);
107
        style.Add(element->GetStyle());
108
        DrawPath(element, &matrix, &style);
109
@@ -352,6 +370,8 @@
110
        break;
111
    case wxSVG_TEXT_ELEMENT: {
112
        wxSVGTextElement* element = (wxSVGTextElement*) elem;
113
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
114
+           break;
115
        element->UpdateMatrix(matrix);
116
        style.Add(element->GetStyle());
117
        DrawText(element, &matrix, &style);
118
@@ -359,6 +379,8 @@
119
    }
120
    case wxSVG_IMAGE_ELEMENT: {
121
        wxSVGImageElement* element = (wxSVGImageElement*) elem;
122
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
123
+           break;
124
        element->UpdateMatrix(matrix);
125
        style.Add(element->GetStyle());
126
        DrawImage(element, &matrix, &style, rect);
127
@@ -366,9 +388,11 @@
128
    }
129
    case wxSVG_VIDEO_ELEMENT: {
130
        wxSVGVideoElement* element = (wxSVGVideoElement*) elem;
131
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
132
+           break;
133
        element->UpdateMatrix(matrix);
134
        style.Add(element->GetStyle());
135
-#ifdef USE_FFMPEG
136
+#ifdef USE_LIBAV
137
        DrawVideo(element, &matrix, &style);
138
 #else
139
        wxSVGGElement* gElem = new wxSVGGElement();
140
@@ -400,6 +424,8 @@
141
    }
142
    case wxSVG_USE_ELEMENT: {
143
        wxSVGUseElement* element = (wxSVGUseElement*) elem;
144
+       if (element->GetVisibility() == wxCSS_VALUE_HIDDEN)
145
+           break;
146
        element->UpdateMatrix(matrix);
147
        style.Add(element->GetStyle());
148
        // test if visible
149
wxsvg-1.1.5.tar.bz2/src/SVGCanvasItem.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGCanvasItem.cpp Changed
117
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/09
5
-// RCS-ID:      $Id: SVGCanvasItem.cpp,v 1.38 2011/11/24 00:02:55 ntalex Exp $
6
+// RCS-ID:      $Id: SVGCanvasItem.cpp,v 1.41 2012/06/24 22:36:58 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -15,7 +15,7 @@
11
 #include <math.h>
12
 #include <wx/log.h>
13
 
14
-#ifdef USE_FFMPEG
15
+#ifdef USE_LIBAV
16
 #include <wxSVG/mediadec_ffmpeg.h>
17
 #endif
18
 
19
@@ -872,26 +872,32 @@
20
    } else if (m_href.length()) {
21
        long pos = 0;
22
        wxString filename = m_href;
23
-       if (!wxFileExists(filename) && m_href.Find(wxT('#')) != wxNOT_FOUND && m_href.AfterLast(wxT('#')).ToLong(&pos))
24
-           filename = m_href.BeforeLast(wxT('#'));
25
-       if (!wxFileExists(filename)) {
26
-           wxLogError(_("Can't load image from file '%s': file does not exist."), filename.c_str());
27
-           return;
28
-       }
29
-       if (element.GetHref().GetAnimVal().EndsWith(wxT(".svg"))) {
30
-           wxSVGDocument imgDoc;
31
-           if (imgDoc.Load(filename) && imgDoc.GetRootElement() != NULL) {
32
-               m_svgImage = imgDoc.GetRootElement();
33
-               imgDoc.RemoveChild(m_svgImage);
34
-               if (m_svgImage->GetViewBox().GetBaseVal().IsEmpty()
35
-                       && m_svgImage->GetWidth().GetBaseVal().GetValue() > 0
36
-                       && m_svgImage->GetWidth().GetBaseVal().GetUnitType() != wxSVG_LENGTHTYPE_PERCENTAGE)
37
-                   m_svgImage->SetViewBox(
38
-                           wxSVGRect(0, 0, m_svgImage->GetWidth().GetBaseVal(), m_svgImage->GetHeight().GetBaseVal()));
39
+       if (filename.StartsWith(wxT("concat:"))) {
40
+           if (filename.Find(wxT('#')) != wxNOT_FOUND && filename.AfterLast(wxT('#')).ToLong(&pos))
41
+               filename = filename.BeforeLast(wxT('#'));
42
+       } else {
43
+           if (!wxFileExists(filename) && filename.Find(wxT('#')) != wxNOT_FOUND
44
+                   && filename.AfterLast(wxT('#')).ToLong(&pos))
45
+               filename = filename.BeforeLast(wxT('#'));
46
+           if (!wxFileExists(filename)) {
47
+               wxLogError(_("Can't load image from file '%s': file does not exist."), filename.c_str());
48
+               return;
49
+           }
50
+           if (element.GetHref().GetAnimVal().EndsWith(wxT(".svg"))) {
51
+               wxSVGDocument imgDoc;
52
+               if (imgDoc.Load(filename) && imgDoc.GetRootElement() != NULL) {
53
+                   m_svgImage = imgDoc.GetRootElement();
54
+                   imgDoc.RemoveChild(m_svgImage);
55
+                   if (m_svgImage->GetViewBox().GetBaseVal().IsEmpty()
56
+                           && m_svgImage->GetWidth().GetBaseVal().GetValue() > 0
57
+                           && m_svgImage->GetWidth().GetBaseVal().GetUnitType() != wxSVG_LENGTHTYPE_PERCENTAGE)
58
+                       m_svgImage->SetViewBox(
59
+                               wxSVGRect(0, 0, m_svgImage->GetWidth().GetBaseVal(), m_svgImage->GetHeight().GetBaseVal()));
60
+               }
61
+               return;
62
            }
63
-           return;
64
        }
65
-#ifdef USE_FFMPEG
66
+#ifdef USE_LIBAV
67
        bool log = wxLog::EnableLogging(false);
68
        m_image.LoadFile(filename);
69
        wxLog::EnableLogging(log);
70
@@ -951,12 +957,12 @@
71
 }
72
 
73
 wxSVGCanvasVideoData::~wxSVGCanvasVideoData() {
74
-#ifdef USE_FFMPEG
75
+#ifdef USE_LIBAV
76
    if (m_mediaDecoder)
77
        delete m_mediaDecoder;
78
 #endif
79
 }
80
-   
81
+
82
 wxSVGCanvasVideo::wxSVGCanvasVideo(): wxSVGCanvasImage(wxSVG_CANVAS_ITEM_VIDEO), m_videoData(NULL) {
83
    // nothing to do
84
 }
85
@@ -973,6 +979,7 @@
86
    m_height = element.GetHeight().GetAnimVal();
87
    m_href = element.GetHref();
88
    m_preserveAspectRatio = element.GetPreserveAspectRatio();
89
+   m_defHeightScale = 1;
90
    m_time = element.GetOwnerDocument() != NULL ? ((wxSVGDocument*) element.GetOwnerDocument())->GetCurrentTime() : 0;
91
    if (element.GetBegin() > 0)
92
        m_time = m_time > element.GetBegin() ? m_time - element.GetBegin() : 0;
93
@@ -980,12 +987,13 @@
94
    if (dur > 0 && m_time > dur)
95
        m_time = dur;
96
    m_time += element.GetClipBegin();
97
-#ifdef USE_FFMPEG
98
+#ifdef USE_LIBAV
99
    wxSVGCanvasVideo* prevItem = (wxSVGCanvasVideo*) element.GetCanvasItem();
100
    if (prevItem != NULL && prevItem->m_href == m_href && prevItem->m_videoData != NULL) {
101
        m_videoData = prevItem->m_videoData;
102
        m_videoData->IncRef();
103
        m_duration = prevItem->m_duration;
104
+       m_defHeightScale = prevItem->m_defHeightScale;
105
        wxFfmpegMediaDecoder* decoder = m_videoData->GetMediaDecoder();
106
        if (decoder != NULL) {
107
            double ftime = decoder->GetFps() != -1 ? 1.0 / decoder->GetFps() : 0.04;
108
@@ -1023,6 +1031,8 @@
109
            } else
110
                m_image = decoder->GetNextFrame();
111
            m_videoData = new wxSVGCanvasVideoData(decoder);
112
+           if (m_image.Ok() && decoder->GetFrameAspectRatio() > 0)
113
+               m_defHeightScale = ((double)m_image.GetWidth())/m_image.GetHeight()/decoder->GetFrameAspectRatio();
114
        } else {
115
            delete decoder;
116
            m_duration = 0;
117
wxsvg-1.1.5.tar.bz2/src/SVGFEGaussianBlurElement.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGFEGaussianBlurElement.cpp Changed
21
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/10
5
-// RCS-ID:      $Id: SVGFEGaussianBlurElement.cpp,v 1.4 2011/06/27 21:14:14 ntalex Exp $
6
+// RCS-ID:      $Id: SVGFEGaussianBlurElement.cpp,v 1.5 2012/01/08 02:42:15 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -33,3 +33,10 @@
11
    }
12
    return false;
13
 }
14
+
15
+wxSvgXmlAttrHash wxSVGFEGaussianBlurElement::GetCustomAttributes() const {
16
+   wxSvgXmlAttrHash attrs;
17
+   if (m_stdDeviationX.GetBaseVal() > 0)
18
+       attrs.Add(wxT("stdDeviation"), wxString::Format(wxT("%g"), m_stdDeviationX.GetBaseVal()));
19
+   return attrs;
20
+}
21
wxsvg-1.1.9.tar.bz2/src/SVGRadialGradientElement.cpp Added
32
 
1
@@ -0,0 +1,30 @@
2
+//////////////////////////////////////////////////////////////////////////////
3
+// Name:        SVGRadialGradientElement.cpp
4
+// Author:      Alex Thuering
5
+// Created:     2012/04/01
6
+// RCS-ID:      $Id: SVGRadialGradientElement.cpp,v 1.1 2012/04/01 20:36:08 ntalex Exp $
7
+// Copyright:   (c) 2012 Alex Thuering
8
+// Licence:     wxWindows licence
9
+//////////////////////////////////////////////////////////////////////////////
10
+
11
+#include "SVGRadialGradientElement.h"
12
+
13
+double wxSVGRadialGradientElement::GetQualifiedR() const {
14
+   return m_r.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_r.GetAnimVal().GetValue() : 0.5;
15
+}
16
+
17
+double wxSVGRadialGradientElement::GetQualifiedCx() const {
18
+   return m_cx.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_cx.GetAnimVal().GetValue() : 0.5;
19
+}
20
+
21
+double wxSVGRadialGradientElement::GetQualifiedCy() const {
22
+   return m_cy.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_cy.GetAnimVal().GetValue() : 0.5;
23
+}
24
+
25
+double wxSVGRadialGradientElement::GetQualifiedFx() const {
26
+   return m_fx.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_fx.GetAnimVal().GetValue() : GetQualifiedCx();
27
+}
28
+
29
+double wxSVGRadialGradientElement::GetQualifiedFy() const {
30
+   return m_fy.GetAnimVal().GetUnitType() != wxSVG_LENGTHTYPE_UNKNOWN ? m_fy.GetAnimVal().GetValue() : GetQualifiedCy();
31
+}
32
wxsvg-1.1.5.tar.bz2/src/SVGStylable.cpp -> wxsvg-1.1.9.tar.bz2/src/SVGStylable.cpp Changed
22
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     
3
 // Author:      Alex Thuering
4
 // Created:     2005/04/29
5
-// RCS-ID:      $Id: SVGStylable.cpp,v 1.5 2007/05/24 08:59:09 etisserant Exp $
6
+// RCS-ID:      $Id: SVGStylable.cpp,v 1.6 2012/01/08 02:42:15 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -38,6 +38,11 @@
11
   return true;
12
 }
13
 
14
+wxSvgXmlAttrHash wxSVGStylable::GetCustomAttributes() const {
15
+   wxSvgXmlAttrHash attrs;
16
+   return attrs;
17
+}
18
+
19
 wxCSSStyleDeclaration wxSVGStylable::GetResultStyle(const wxSVGElement& element)
20
 {
21
   wxCSSStyleDeclaration style;
22
wxsvg-1.1.5.tar.bz2/src/agg/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/agg/Makefile.in Changed
71
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -100,8 +100,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -121,6 +119,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -168,6 +168,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -269,7 +272,7 @@
43
      echo "rm -f \"$${dir}/so_locations\""; \
44
      rm -f "$${dir}/so_locations"; \
45
    done
46
-libwxsvg_agg.la: $(libwxsvg_agg_la_OBJECTS) $(libwxsvg_agg_la_DEPENDENCIES) 
47
+libwxsvg_agg.la: $(libwxsvg_agg_la_OBJECTS) $(libwxsvg_agg_la_DEPENDENCIES) $(EXTRA_libwxsvg_agg_la_DEPENDENCIES) 
48
    $(CXXLINK)  $(libwxsvg_agg_la_OBJECTS) $(libwxsvg_agg_la_LIBADD) $(LIBS)
49
 
50
 mostlyclean-compile:
51
@@ -405,10 +408,15 @@
52
 
53
 installcheck: installcheck-am
54
 install-strip:
55
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
-     `test -z '$(STRIP)' || \
58
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
59
+   if test -z '$(STRIP)'; then \
60
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
61
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
62
+         install; \
63
+   else \
64
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
67
+   fi
68
 mostlyclean-generic:
69
 
70
 clean-generic:
71
wxsvg-1.1.5.tar.bz2/src/cairo/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/cairo/Makefile.in Changed
71
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -97,8 +97,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -118,6 +116,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -165,6 +165,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -267,7 +270,7 @@
43
      echo "rm -f \"$${dir}/so_locations\""; \
44
      rm -f "$${dir}/so_locations"; \
45
    done
46
-libwxsvg_cairo.la: $(libwxsvg_cairo_la_OBJECTS) $(libwxsvg_cairo_la_DEPENDENCIES) 
47
+libwxsvg_cairo.la: $(libwxsvg_cairo_la_OBJECTS) $(libwxsvg_cairo_la_DEPENDENCIES) $(EXTRA_libwxsvg_cairo_la_DEPENDENCIES) 
48
    $(CXXLINK)  $(libwxsvg_cairo_la_OBJECTS) $(libwxsvg_cairo_la_LIBADD) $(LIBS)
49
 
50
 mostlyclean-compile:
51
@@ -404,10 +407,15 @@
52
 
53
 installcheck: installcheck-am
54
 install-strip:
55
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
-     `test -z '$(STRIP)' || \
58
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
59
+   if test -z '$(STRIP)'; then \
60
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
61
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
62
+         install; \
63
+   else \
64
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
67
+   fi
68
 mostlyclean-generic:
69
 
70
 clean-generic:
71
wxsvg-1.1.5.tar.bz2/src/cairo/SVGCanvasCairo.cpp -> wxsvg-1.1.9.tar.bz2/src/cairo/SVGCanvasCairo.cpp Changed
158
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     Cairo render
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/12
5
-// RCS-ID:      $Id: SVGCanvasCairo.cpp,v 1.17 2011/11/22 21:09:42 ntalex Exp $
6
+// RCS-ID:      $Id: SVGCanvasCairo.cpp,v 1.22 2012/04/09 12:17:00 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -147,11 +147,11 @@
11
            }
12
            case wxSVG_RADIALGRADIENT_ELEMENT: {
13
                wxSVGRadialGradientElement* radialGradElem = (wxSVGRadialGradientElement*) gradElem;
14
-               double r = radialGradElem->GetR().GetAnimVal();
15
-               double cx = radialGradElem->GetCx().GetAnimVal();
16
-               double cy = radialGradElem->GetCy().GetAnimVal();
17
-               double fx = radialGradElem->GetFx().GetAnimVal();
18
-               double fy = radialGradElem->GetFy().GetAnimVal();
19
+               double r = radialGradElem->GetQualifiedR();
20
+               double cx = radialGradElem->GetQualifiedCx();
21
+               double cy = radialGradElem->GetQualifiedCy();
22
+               double fx = radialGradElem->GetQualifiedFx();
23
+               double fy = radialGradElem->GetQualifiedFy();
24
                
25
                if (gradElem->GetGradientUnits().GetAnimVal() == wxSVG_UNIT_TYPE_UNKNOWN
26
                        || gradElem->GetGradientUnits().GetAnimVal() == wxSVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
27
@@ -162,7 +162,17 @@
28
                    fx = bbox.GetX() + fx * bbox.GetWidth();
29
                    fy = bbox.GetY() + fy * bbox.GetHeight();
30
                }
31
-               m_pattern = cairo_pattern_create_radial(fx, fy, 0.0, cx, cy, r); 
32
+               m_pattern = cairo_pattern_create_radial(fx, fy, 0.0, cx, cy, r);
33
+               const wxSVGTransformList& transforms =  gradElem->GetGradientTransform().GetAnimVal();
34
+               if (transforms.GetCount() > 0) {
35
+                   wxSVGMatrix matrix;
36
+                   for (unsigned int i = 0; i < transforms.GetCount(); i++)
37
+                       matrix = matrix.Multiply(transformsi.GetMatrix());
38
+                   matrix = matrix.Inverse();
39
+                   cairo_matrix_t mat;
40
+                   cairo_matrix_init(&mat, matrix.GetA(), matrix.GetB(), matrix.GetC(), matrix.GetD(), matrix.GetE(), matrix.GetF());
41
+                   cairo_pattern_set_matrix(m_pattern, &mat);
42
+               }
43
                break;
44
            }
45
            default:
46
@@ -373,7 +383,7 @@
47
    // check Filter
48
    if (style.GetFilter().GetCSSPrimitiveType() == wxCSS_URI && style.GetFilter().GetStringValue().length() > 1) {
49
        wxString filterId = style.GetFilter().GetStringValue().substr(1);
50
-       wxSVGElement* filterElem = (wxSVGSVGElement*) svgElem.GetElementById(filterId);
51
+       wxSVGElement* filterElem = (wxSVGElement*) svgElem.GetElementById(filterId);
52
        // feGaussianBlur
53
        if (filterElem && filterElem->GetDtd() == wxSVG_FILTER_ELEMENT && filterElem->GetFirstChild() != NULL
54
                && ((wxSVGSVGElement*) filterElem->GetFirstChild())->GetDtd() == wxSVG_FEGAUSSIANBLUR_ELEMENT) {
55
@@ -409,6 +419,8 @@
56
            cairo_paint(m_cr); // fill the rectangle using the pattern
57
            cairo_new_path(m_cr);
58
            cairo_restore(m_cr);
59
+           
60
+           cairo_pattern_destroy(pattern);
61
            cairo_destroy(cr);
62
            cairo_surface_destroy(surface);
63
            return;
64
@@ -428,6 +440,57 @@
65
    cairo_matrix_init(&mat, matrix.GetA(), matrix.GetB(), matrix.GetC(), matrix.GetD(), matrix.GetE(), matrix.GetF());
66
    cairo_set_matrix(m_cr, &mat);
67
    
68
+   // ClipPath
69
+   if (style.GetClipPath().GetCSSPrimitiveType() == wxCSS_URI && style.GetClipPath().GetStringValue().length() > 1) {
70
+       wxString clipPathId = style.GetClipPath().GetStringValue().substr(1);
71
+       wxSVGElement* clipPathElem = (wxSVGElement*) svgElem.GetElementById(clipPathId);
72
+       if (clipPathElem && clipPathElem->GetDtd() == wxSVG_CLIPPATH_ELEMENT) {
73
+           wxSVGElement* elem = (wxSVGElement*) clipPathElem->GetFirstChild();
74
+           while (elem != NULL) {
75
+               if (elem->GetOwnerSVGElement() == NULL)
76
+                   elem->SetOwnerSVGElement(&svgElem);
77
+               if (elem->GetViewportElement() == NULL)
78
+                   elem->SetViewportElement(&svgElem);
79
+               wxSVGDocument* doc = (wxSVGDocument*) elem->GetOwnerDocument();
80
+               wxSVGCanvasItem* canvasItem = NULL;
81
+               switch (elem->GetDtd()) {
82
+               case wxSVG_LINE_ELEMENT:
83
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGLineElement*) elem);
84
+                   break;
85
+               case wxSVG_POLYLINE_ELEMENT:
86
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGPolylineElement*) elem);
87
+                   break;
88
+               case wxSVG_POLYGON_ELEMENT:
89
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGPolygonElement*) elem);
90
+                   break;
91
+               case wxSVG_RECT_ELEMENT:
92
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGRectElement*) elem);
93
+                   break;
94
+               case wxSVG_CIRCLE_ELEMENT:
95
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGCircleElement*) elem);
96
+                   break;
97
+               case wxSVG_ELLIPSE_ELEMENT: {
98
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGEllipseElement*) elem);
99
+                   break;
100
+               }
101
+               case wxSVG_PATH_ELEMENT:
102
+                   canvasItem = doc->GetCanvas()->CreateItem((wxSVGPathElement*) elem);
103
+                   break;
104
+               default:
105
+                   break;
106
+               }
107
+               if (canvasItem != NULL) {
108
+                   cairo_path_t* path = ((wxSVGCanvasPathCairo*) canvasItem)->GetPath();
109
+                   cairo_append_path(m_cr, path);
110
+                   cairo_clip(m_cr);
111
+                   //cairo_path_destroy(path);
112
+                   delete canvasItem;
113
+               }
114
+               elem = (wxSVGElement*) elem->GetNextSibling();
115
+           }
116
+       }
117
+   }
118
+   
119
    // scale context
120
    double x = canvasImage.m_x;
121
    double y = canvasImage.m_y;
122
@@ -436,6 +499,7 @@
123
    wxSVG_PRESERVEASPECTRATIO align = canvasImage.GetPreserveAspectRatio().GetAlign();
124
    bool alignX = false;
125
    if (align > wxSVG_PRESERVEASPECTRATIO_NONE) {
126
+       scaleY = canvasImage.m_height / canvasImage.GetDefaultHeight();
127
        if (canvasImage.GetPreserveAspectRatio().GetMeetOrSlice() != wxSVG_MEETORSLICE_SLICE) {
128
            alignX = scaleX > scaleY;
129
        } else {
130
@@ -448,22 +512,23 @@
131
            if (align == wxSVG_PRESERVEASPECTRATIO_XMIDYMIN
132
                    || align == wxSVG_PRESERVEASPECTRATIO_XMIDYMID
133
                    || align == wxSVG_PRESERVEASPECTRATIO_XMIDYMAX)
134
-               x += (canvasImage.m_width - canvasImage.m_image.GetWidth() * scaleX) / 2;
135
+               x += (canvasImage.m_width - canvasImage.GetDefaultWidth() * scaleX) / 2;
136
            else if (align == wxSVG_PRESERVEASPECTRATIO_XMAXYMIN
137
                    || align == wxSVG_PRESERVEASPECTRATIO_XMAXYMID
138
                    || align == wxSVG_PRESERVEASPECTRATIO_XMAXYMAX)
139
-               x += canvasImage.m_width - canvasImage.m_image.GetWidth() * scaleX;
140
+               x += canvasImage.m_width - canvasImage.GetDefaultWidth() * scaleX;
141
        } else {
142
            scaleY = scaleX;
143
            if (align == wxSVG_PRESERVEASPECTRATIO_XMINYMID
144
                    || align == wxSVG_PRESERVEASPECTRATIO_XMIDYMID
145
                    || align == wxSVG_PRESERVEASPECTRATIO_XMAXYMID)
146
-               y += (canvasImage.m_height - canvasImage.m_image.GetHeight() * scaleY) / 2;
147
+               y += (canvasImage.m_height - canvasImage.GetDefaultHeight() * scaleY) / 2;
148
            else if (align == wxSVG_PRESERVEASPECTRATIO_XMINYMAX
149
                    || align == wxSVG_PRESERVEASPECTRATIO_XMIDYMAX
150
                    || align == wxSVG_PRESERVEASPECTRATIO_XMAXYMAX)
151
-               y += canvasImage.m_height - canvasImage.m_image.GetHeight() * scaleY;
152
+               y += canvasImage.m_height - canvasImage.GetDefaultHeight() * scaleY;
153
        }
154
+       scaleY = scaleY * canvasImage.GetDefaultHeight() / canvasImage.m_image.GetHeight();
155
    }
156
    cairo_translate(m_cr, x, y);
157
    cairo_scale(m_cr, scaleX, scaleY);
158
wxsvg-1.1.5.tar.bz2/src/cairo/SVGCanvasPathCairo.cpp -> wxsvg-1.1.9.tar.bz2/src/cairo/SVGCanvasPathCairo.cpp Changed
22
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     Cairo canvas path
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/12
5
-// RCS-ID:      $Id: SVGCanvasPathCairo.cpp,v 1.6 2011/10/31 07:53:01 ntalex Exp $
6
+// RCS-ID:      $Id: SVGCanvasPathCairo.cpp,v 1.7 2012/01/08 02:43:09 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -53,7 +53,10 @@
11
    }
12
    ApplyStrokeStyle(m_cr, style);
13
    double x1, y1, x2, y2;
14
-   cairo_stroke_extents(m_cr, &x1, &y1, &x2, &y2);
15
+   if (style.GetStrokeWidth() > 0)
16
+       cairo_stroke_extents(m_cr, &x1, &y1, &x2, &y2);
17
+   else
18
+       cairo_fill_extents(m_cr, &x1, &y1, &x2, &y2);
19
    if (&matrix) {
20
        cairo_matrix_t mat;
21
        cairo_matrix_init(&mat, 1, 0, 0, 1, 0, 0);
22
wxsvg-1.1.5.tar.bz2/src/cairo/SVGCanvasTextCairo.cpp -> wxsvg-1.1.9.tar.bz2/src/cairo/SVGCanvasTextCairo.cpp Changed
46
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     Cairo canvas text
3
 // Author:      Alex Thuering
4
 // Created:     2011/06/23
5
-// RCS-ID:      $Id: SVGCanvasTextCairo.cpp,v 1.6 2011/08/04 20:58:33 ntalex Exp $
6
+// RCS-ID:      $Id: SVGCanvasTextCairo.cpp,v 1.8 2012/01/21 15:06:50 ntalex Exp $
7
 // Copyright:   (c) 2011 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -14,8 +14,10 @@
11
 #include <wx/font.h>
12
 #include <wx/tokenzr.h>
13
 #include <cairo/cairo.h>
14
-#ifdef __WXMSW__
15
+#if defined(__WXMSW__)
16
 #include <cairo/cairo-win32.h>
17
+#elif defined(__WXMAC__) 
18
+#include <cairo/cairo-quartz.h>
19
 #else
20
 #include <pango/pangocairo.h>
21
 #endif
22
@@ -32,7 +34,7 @@
23
    // create path from text
24
    cairo_t* cr = ((wxSVGCanvasPathCairo*) m_char->path)->GetCr();
25
    
26
-#ifdef __WXMSW__
27
+#if defined(__WXMSW__) || defined(__WXMAC__)
28
    int size = (int) style.GetFontSize();
29
    int fstyle = style.GetFontStyle() == wxCSS_VALUE_ITALIC ? wxFONTSTYLE_ITALIC
30
            : (style.GetFontStyle() == wxCSS_VALUE_OBLIQUE ? wxFONTSTYLE_SLANT : wxFONTSTYLE_NORMAL);
31
@@ -40,9 +42,13 @@
32
            : style.GetFontWeight() == wxCSS_VALUE_BOLDER ? wxFONTWEIGHT_MAX
33
            : style.GetFontWeight() == wxCSS_VALUE_LIGHTER ? wxFONTWEIGHT_LIGHT : wxFONTWEIGHT_NORMAL;
34
    wxFont fnt(size, wxFONTFAMILY_DEFAULT, fstyle, weight, false, style.GetFontFamily());
35
+#ifdef __WXMSW__
36
    HFONT hfont = (HFONT) fnt.GetResourceHandle();
37
-   
38
    cairo_set_font_face(cr, cairo_win32_font_face_create_for_hfont(hfont));
39
+#else
40
+   wxUint32 atsuFontId = fnt.MacGetATSUFontID();
41
+   cairo_set_font_face(cr, cairo_quartz_font_face_create_for_atsu_font_id(atsuFontId));
42
+#endif 
43
    cairo_set_font_size(cr, style.GetFontSize());
44
    
45
    cairo_font_extents_t fextents;
46
wxsvg-1.1.5.tar.bz2/src/freetype/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/freetype/Makefile.in Changed
71
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -96,8 +96,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -117,6 +115,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -164,6 +164,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -266,7 +269,7 @@
43
      echo "rm -f \"$${dir}/so_locations\""; \
44
      rm -f "$${dir}/so_locations"; \
45
    done
46
-libwxsvg_freetype.la: $(libwxsvg_freetype_la_OBJECTS) $(libwxsvg_freetype_la_DEPENDENCIES) 
47
+libwxsvg_freetype.la: $(libwxsvg_freetype_la_OBJECTS) $(libwxsvg_freetype_la_DEPENDENCIES) $(EXTRA_libwxsvg_freetype_la_DEPENDENCIES) 
48
    $(CXXLINK)  $(libwxsvg_freetype_la_OBJECTS) $(libwxsvg_freetype_la_LIBADD) $(LIBS)
49
 
50
 mostlyclean-compile:
51
@@ -400,10 +403,15 @@
52
 
53
 installcheck: installcheck-am
54
 install-strip:
55
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
-     `test -z '$(STRIP)' || \
58
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
59
+   if test -z '$(STRIP)'; then \
60
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
61
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
62
+         install; \
63
+   else \
64
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
67
+   fi
68
 mostlyclean-generic:
69
 
70
 clean-generic:
71
wxsvg-1.1.5.tar.bz2/src/imagsvg.cpp -> wxsvg-1.1.9.tar.bz2/src/imagsvg.cpp Changed
19
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     SVG Image Handler
3
 // Author:      Alex Thuering
4
 // Created:     2011/11/22
5
-// RCS-ID:      $Id: imagsvg.cpp,v 1.1 2011/11/22 20:08:35 ntalex Exp $
6
+// RCS-ID:      $Id: imagsvg.cpp,v 1.2 2011/12/27 08:20:32 ntalex Exp $
7
 // Copyright:   (c) Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -16,7 +16,7 @@
11
 wxSVGHandler::wxSVGHandler() {
12
    m_name = wxT("SVG file");
13
    m_extension = wxT("svg");
14
-   m_type = wxBITMAP_TYPE_SVG;
15
+   m_type = (wxBitmapType) wxBITMAP_TYPE_SVG;
16
    m_mime = wxT("image/svg");
17
 }
18
 
19
wxsvg-1.1.5.tar.bz2/src/libart/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/libart/Makefile.in Changed
71
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -97,8 +97,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -118,6 +116,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -165,6 +165,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -267,7 +270,7 @@
43
      echo "rm -f \"$${dir}/so_locations\""; \
44
      rm -f "$${dir}/so_locations"; \
45
    done
46
-libwxsvg_libart.la: $(libwxsvg_libart_la_OBJECTS) $(libwxsvg_libart_la_DEPENDENCIES) 
47
+libwxsvg_libart.la: $(libwxsvg_libart_la_OBJECTS) $(libwxsvg_libart_la_DEPENDENCIES) $(EXTRA_libwxsvg_libart_la_DEPENDENCIES) 
48
    $(CXXLINK)  $(libwxsvg_libart_la_OBJECTS) $(libwxsvg_libart_la_LIBADD) $(LIBS)
49
 
50
 mostlyclean-compile:
51
@@ -402,10 +405,15 @@
52
 
53
 installcheck: installcheck-am
54
 install-strip:
55
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
-     `test -z '$(STRIP)' || \
58
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
59
+   if test -z '$(STRIP)'; then \
60
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
61
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
62
+         install; \
63
+   else \
64
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
67
+   fi
68
 mostlyclean-generic:
69
 
70
 clean-generic:
71
wxsvg-1.1.5.tar.bz2/src/mediadec_ffmpeg.cpp -> wxsvg-1.1.9.tar.bz2/src/mediadec_ffmpeg.cpp Changed
98
 
1
@@ -3,34 +3,23 @@
2
 // Purpose:     FFMPEG Media Decoder
3
 // Author:      Alex Thuering
4
 // Created:     21.07.2007
5
-// RCS-ID:      $Id: mediadec_ffmpeg.cpp,v 1.15 2011/08/02 06:48:14 ntalex Exp $
6
+// RCS-ID:      $Id: mediadec_ffmpeg.cpp,v 1.22 2012/06/24 22:35:42 ntalex Exp $
7
 // Copyright:   (c) Alex Thuering
8
 // Licence:     wxWindows licence
9
 /////////////////////////////////////////////////////////////////////////////
10
 
11
+#define __STDC_CONSTANT_MACROS
12
+#define __STDC_LIMIT_MACROS
13
+
14
 #include <wxSVG/mediadec_ffmpeg.h>
15
 #include <wx/wx.h>
16
 #include <errno.h>
17
 
18
-#define INT64_C(val) val##LL
19
-#define UINT64_C(val) val##ULL
20
-#ifndef int64_t_C
21
-#define int64_t_C(c)     (c ## LL)
22
-#define uint64_t_C(c)    (c ## ULL)
23
-#endif
24
-#ifndef INT64_MAX
25
-#define INT64_MAX int64_t_C(0x7fffffffffffffff)
26
-#endif
27
 extern "C" {
28
-#define __STDC_CONSTANT_MACROS
29
-#define __STDC_LIMIT_MACROS
30
-#ifdef HAVE_FFMPEG_AVUTIL_H
31
-#include <avformat.h>
32
-#include <swscale.h>
33
-#else
34
 #include <libavformat/avformat.h>
35
 #include <libswscale/swscale.h>
36
-#endif
37
+#include <libavutil/avutil.h>
38
+#include <libavutil/mathematics.h>
39
 }
40
 
41
 wxFfmpegMediaDecoder::wxFfmpegMediaDecoder(): m_formatCtx(NULL), m_codecCtx(NULL), m_frame(NULL) {
42
@@ -57,17 +46,19 @@
43
 
44
 bool wxFfmpegMediaDecoder::Load(const wxString& fileName) {
45
    Close();
46
-   if (!wxFileExists(fileName)) {
47
+   if ((fileName.Find(wxT(':')) <= 0 || fileName.Find(wxT(':')) >= 8
48
+           || fileName.GetChar(fileName.Find(wxT(':')) - 1) == wxT('\\'))
49
+           && !wxFileExists(fileName)) {
50
        wxLogError(wxT("%s: no such file or directory"), fileName.c_str());
51
        return false;
52
    }
53
-   int err = av_open_input_file(&m_formatCtx, fileName.mb_str(), NULL, 0, NULL);
54
+   int err = avformat_open_input(&m_formatCtx, fileName.mb_str(), NULL, NULL);
55
    if (err != 0) {
56
        PrintError(fileName, err);
57
        return false;
58
    }
59
    // Retrieve stream information
60
-   if (av_find_stream_info(m_formatCtx)<0) {
61
+   if (avformat_find_stream_info(m_formatCtx, NULL) < 0) {
62
        wxLogError(wxT("%s: could not find codec parameters"), fileName.c_str());
63
        return false;
64
    }
65
@@ -77,8 +68,7 @@
66
 void wxFfmpegMediaDecoder::Close() {
67
    EndDecode();
68
    if (m_formatCtx)
69
-       av_close_input_file(m_formatCtx);
70
-   m_formatCtx = NULL;
71
+       avformat_close_input(&m_formatCtx);
72
 }
73
 
74
 unsigned int wxFfmpegMediaDecoder::GetStreamCount() {
75
@@ -160,10 +150,9 @@
76
    return m_formatCtx ? m_formatCtx->streamsstreamIndex->codec->bit_rate : -1;
77
 }
78
 
79
-double wxFfmpegMediaDecoder::GetDuration()
80
-{
81
-    return m_formatCtx != NULL && m_formatCtx->duration != (int)AV_NOPTS_VALUE ?
82
-      m_formatCtx->duration / AV_TIME_BASE : -1;
83
+double wxFfmpegMediaDecoder::GetDuration() {
84
+   return m_formatCtx != NULL && m_formatCtx->duration != (int)AV_NOPTS_VALUE ?
85
+           ((double)m_formatCtx->duration) / AV_TIME_BASE : -1;
86
 }
87
 
88
 bool wxFfmpegMediaDecoder::OpenVideoDecoder() {
89
@@ -183,7 +172,7 @@
90
    m_codecCtx = m_formatCtx->streamsm_videoStream->codec;
91
    // find and open the decoder for the video stream 
92
    AVCodec* codec = avcodec_find_decoder(m_codecCtx->codec_id);
93
-   if (!codec || avcodec_open(m_codecCtx, codec)<0) {
94
+   if (!codec || avcodec_open2(m_codecCtx, codec, NULL) < 0) {
95
        m_codecCtx = NULL;
96
        return false;
97
    }
98
wxsvg-1.1.5.tar.bz2/src/svgctrl.cpp -> wxsvg-1.1.9.tar.bz2/src/svgctrl.cpp Changed
21
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     svg control widget
3
 // Author:      Alex Thuering
4
 // Created:     2005/05/07
5
-// RCS-ID:      $Id: svgctrl.cpp,v 1.18 2011/10/09 12:20:48 ntalex Exp $
6
+// RCS-ID:      $Id: svgctrl.cpp,v 1.19 2012/04/09 11:29:36 ntalex Exp $
7
 // Copyright:   (c) 2005 Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -104,8 +104,8 @@
11
    dc.DrawRectangle(m_buffer.GetWidth(), 0, w - m_buffer.GetWidth(), h);
12
    dc.DrawRectangle(0, m_buffer.GetHeight(), m_buffer.GetWidth(), h - m_buffer.GetHeight());
13
 #endif
14
-
15
-   dc.DrawBitmap(m_buffer, 0, 0);
16
+   if (m_buffer.IsOk())
17
+       dc.DrawBitmap(m_buffer, 0, 0);
18
 }
19
 
20
 void wxSVGCtrlBase::RepaintBuffer() {
21
wxsvg-1.1.5.tar.bz2/src/svgxml/Makefile.in -> wxsvg-1.1.9.tar.bz2/src/svgxml/Makefile.in Changed
71
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -95,8 +95,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -116,6 +114,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -163,6 +163,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -262,7 +265,7 @@
43
      echo "rm -f \"$${dir}/so_locations\""; \
44
      rm -f "$${dir}/so_locations"; \
45
    done
46
-libwxsvgxml.la: $(libwxsvgxml_la_OBJECTS) $(libwxsvgxml_la_DEPENDENCIES) 
47
+libwxsvgxml.la: $(libwxsvgxml_la_OBJECTS) $(libwxsvgxml_la_DEPENDENCIES) $(EXTRA_libwxsvgxml_la_DEPENDENCIES) 
48
    $(CXXLINK)  $(libwxsvgxml_la_OBJECTS) $(libwxsvgxml_la_LIBADD) $(LIBS)
49
 
50
 mostlyclean-compile:
51
@@ -397,10 +400,15 @@
52
 
53
 installcheck: installcheck-am
54
 install-strip:
55
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
-     `test -z '$(STRIP)' || \
58
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
59
+   if test -z '$(STRIP)'; then \
60
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
61
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
62
+         install; \
63
+   else \
64
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
67
+   fi
68
 mostlyclean-generic:
69
 
70
 clean-generic:
71
wxsvg-1.1.5.tar.bz2/src/svgxml/svgxml.cpp -> wxsvg-1.1.9.tar.bz2/src/svgxml/svgxml.cpp Changed
143
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     wxSvgXmlDocument - XML parser & data holder class
3
 // Author:      Vaclav Slavik
4
 // Created:     2000/03/05
5
-// RCS-ID:      $Id: svgxml.cpp,v 1.4 2011/11/23 20:33:13 ntalex Exp $
6
+// RCS-ID:      $Id: svgxml.cpp,v 1.7 2012/04/09 12:20:07 ntalex Exp $
7
 // Copyright:   (c) 2000 Vaclav Slavik
8
 // Licence:     wxWindows licence
9
 /////////////////////////////////////////////////////////////////////////////
10
@@ -189,7 +189,8 @@
11
 
12
 void wxSvgXmlNode::InsertChild(wxSvgXmlNode *child, wxSvgXmlNode *before_node)
13
 {
14
-    wxASSERT_MSG(before_node->GetParent() == this, wxT("wxSvgXmlNode::InsertChild - the node has incorrect parent"));
15
+    wxASSERT_MSG(before_node == NULL || before_node->GetParent() == this,
16
+           wxT("wxSvgXmlNode::InsertChild - the node has incorrect parent"));
17
 
18
     if (m_children == before_node)
19
        m_children = child;
20
@@ -313,66 +314,50 @@
21
     }
22
 }
23
 
24
-wxString wxSvgXmlNode::GetAttribute(const wxString& name)
25
-{
26
-  wxString val;
27
-  GetPropVal(name, &val);
28
-  return val;
29
+wxString wxSvgXmlNode::GetAttribute(const wxString& name) {
30
+   wxString val;
31
+   GetPropVal(name, &val);
32
+   return val;
33
 }
34
 
35
-wxString wxSvgXmlNode::GetAttributeNS(const wxString& namespaceURI, 
36
-                                  const wxString& localName)
37
-{
38
-  return GetAttribute(localName);
39
+wxString wxSvgXmlNode::GetAttributeNS(const wxString& namespaceURI, const wxString& localName) {
40
+   return GetAttribute(localName);
41
 }
42
 
43
-bool wxSvgXmlNode::SetAttribute(const wxString& name, const wxString& value)
44
-{
45
-  wxSvgXmlProperty *prop = GetProperties();
46
-  while (prop)
47
-  {
48
-   if (prop->GetName() == name)
49
-   {
50
-     prop->SetValue(value);
51
-     return true;
52
+bool wxSvgXmlNode::SetAttribute(const wxString& name, const wxString& value) {
53
+   wxSvgXmlProperty *prop = GetProperties();
54
+   while (prop) {
55
+       if (prop->GetName() == name) {
56
+           prop->SetValue(value);
57
+           return true;
58
+       }
59
+       prop = prop->GetNext();
60
    }
61
-   prop = prop->GetNext();
62
-  }
63
-  AddProperty(name, value);
64
-  return true;
65
+   AddProperty(name, value);
66
+   return true;
67
 }
68
 
69
-bool wxSvgXmlNode::SetAttributeNS(const wxString& namespaceURI, 
70
-                              const wxString& qualifiedName, 
71
-                              const wxString& value)
72
-{
73
-  return SetAttribute(qualifiedName, value);
74
+bool wxSvgXmlNode::SetAttributeNS(const wxString& namespaceURI, const wxString& qualifiedName, const wxString& value) {
75
+   return SetAttribute(qualifiedName, value);
76
 }
77
 
78
-void wxSvgXmlNode::RemoveAttribute(const wxString& name)
79
-{
80
-  DeleteProperty(name);
81
+void wxSvgXmlNode::RemoveAttribute(const wxString& name) {
82
+   DeleteProperty(name);
83
 }
84
 
85
-void wxSvgXmlNode::RemoveAttributeNS(const wxString& namespaceURI, 
86
-                                 const wxString& localName)
87
-{
88
-  RemoveAttribute(localName);
89
+void wxSvgXmlNode::RemoveAttributeNS(const wxString& namespaceURI, const wxString& localName) {
90
+   RemoveAttribute(localName);
91
 }
92
 
93
-bool wxSvgXmlNode::HasAttribute(const wxString& name)
94
-{
95
+bool wxSvgXmlNode::HasAttribute(const wxString& name) {
96
   return HasProp(name);
97
 }
98
 
99
-bool wxSvgXmlNode::HasAttributeNS(const wxString& namespaceURI, 
100
-                              const wxString& localName)
101
-{
102
+bool wxSvgXmlNode::HasAttributeNS(const wxString& namespaceURI, const wxString& localName) {
103
   return HasAttribute(localName);
104
 }
105
 
106
-wxSvgXmlAttrHash wxSvgXmlNode::GetAttributes() const
107
-{
108
+wxSvgXmlAttrHash wxSvgXmlNode::GetAttributes() const {
109
   wxSvgXmlAttrHash attributes;
110
   wxSvgXmlProperty *prop = GetProperties();
111
   while (prop)
112
@@ -454,8 +439,11 @@
113
     m_root = new wxSvgXmlNode(*doc.m_root);
114
 }
115
 
116
-bool wxSvgXmlDocument::Load(const wxString& filename, const wxString& encoding)
117
-{
118
+bool wxSvgXmlDocument::Load(const wxString& filename, const wxString& encoding) {
119
+   if (!wxFile::Exists(filename)) {
120
+       wxLogError(_("File %s doesn't exist."), filename.c_str());
121
+       return false;
122
+   }
123
     wxFileInputStream stream(filename);
124
     return Load(stream, encoding);
125
 }
126
@@ -804,13 +792,9 @@
127
             OutputString(stream, node->GetName(), NULL, NULL);
128
 
129
             attributes = node->GetAttributes();
130
-            for (wxSvgXmlAttrHash::iterator it = attributes.begin();
131
-                 it != attributes.end(); ++it)
132
-            {
133
-                OutputString(stream, wxT(" ") + it->first +  wxT("=\""),
134
-                             NULL, NULL);
135
-                OutputStringEnt(stream, it->second, NULL, NULL,
136
-                                true/*escapeQuotes*/);
137
+            for (wxSvgXmlAttrHash::iterator it = attributes.begin(); it != attributes.end(); ++it) {
138
+                OutputString(stream, wxT(" ") + it->GetName() +  wxT("=\""), NULL, NULL);
139
+                OutputStringEnt(stream, it->GetValue(), NULL, NULL, true/*escapeQuotes*/);
140
                 OutputString(stream, wxT("\""), NULL, NULL);
141
             }
142
 
143
wxsvg-1.1.5.tar.bz2/svgview/Makefile.in -> wxsvg-1.1.9.tar.bz2/svgview/Makefile.in Changed
71
 
1
@@ -1,9 +1,9 @@
2
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
3
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
4
 # @configure_input@
5
 
6
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
7
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
8
-# Inc.
9
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
10
+# Foundation, Inc.
11
 # This Makefile.in is free software; the Free Software Foundation
12
 # gives unlimited permission to copy and/or distribute it,
13
 # with or without modifications, as long as this notice is preserved.
14
@@ -97,8 +97,6 @@
15
 ECHO_T = @ECHO_T@
16
 EGREP = @EGREP@
17
 EXEEXT = @EXEEXT@
18
-FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
19
-FFMPEG_LIBS = @FFMPEG_LIBS@
20
 FGREP = @FGREP@
21
 FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
22
 FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
23
@@ -118,6 +116,8 @@
24
 LIBART_CFLAGS = @LIBART_CFLAGS@
25
 LIBART_CONFIG = @LIBART_CONFIG@
26
 LIBART_LIBS = @LIBART_LIBS@
27
+LIBAV_CFLAGS = @LIBAV_CFLAGS@
28
+LIBAV_LIBS = @LIBAV_LIBS@
29
 LIBOBJS = @LIBOBJS@
30
 LIBRARY_VERSION = @LIBRARY_VERSION@
31
 LIBS = @LIBS@
32
@@ -165,6 +165,9 @@
33
 WX_LIBS_STATIC = @WX_LIBS_STATIC@
34
 WX_RESCOMP = @WX_RESCOMP@
35
 WX_VERSION = @WX_VERSION@
36
+WX_VERSION_MAJOR = @WX_VERSION_MAJOR@
37
+WX_VERSION_MICRO = @WX_VERSION_MICRO@
38
+WX_VERSION_MINOR = @WX_VERSION_MINOR@
39
 abs_builddir = @abs_builddir@
40
 abs_srcdir = @abs_srcdir@
41
 abs_top_builddir = @abs_top_builddir@
42
@@ -298,7 +301,7 @@
43
    list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
44
    echo " rm -f" $$list; \
45
    rm -f $$list
46
-svgview$(EXEEXT): $(svgview_OBJECTS) $(svgview_DEPENDENCIES) 
47
+svgview$(EXEEXT): $(svgview_OBJECTS) $(svgview_DEPENDENCIES) $(EXTRA_svgview_DEPENDENCIES) 
48
    @rm -f svgview$(EXEEXT)
49
    $(CXXLINK) $(svgview_OBJECTS) $(svgview_LDADD) $(LIBS)
50
 
51
@@ -436,10 +439,15 @@
52
 
53
 installcheck: installcheck-am
54
 install-strip:
55
-   $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
56
-     install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
57
-     `test -z '$(STRIP)' || \
58
-       echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
59
+   if test -z '$(STRIP)'; then \
60
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
61
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
62
+         install; \
63
+   else \
64
+     $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
65
+       install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
66
+       "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
67
+   fi
68
 mostlyclean-generic:
69
 
70
 clean-generic:
71
wxsvg-1.1.5.tar.bz2/svgview/gradients.svg -> wxsvg-1.1.9.tar.bz2/svgview/gradients.svg Changed
19
 
1
@@ -178,6 +178,10 @@
2
        r="167.13416"
3
        gradientTransform="matrix(1.000000,0.000000,0.000000,7.039102e-2,0.000000,262.6215)"
4
        gradientUnits="userSpaceOnUse" />
5
+    <radialGradient id="gradient_1" cx="80.0" cy="81.0" r="30.0" gradientUnits="userSpaceOnUse">
6
+       <stop offset="0.0" style="stop-color:#FFFFFF"/>
7
+       <stop offset="1.0" style="stop-color:#800000"/>
8
+   </radialGradient>
9
   </defs>
10
   <sodipodi:namedview
11
      inkscape:window-y="0"
12
@@ -354,5 +358,6 @@
13
        sodipodi:ry="51.51778"
14
        d="M 145.46197 382.8223 A 55.053314 51.51778 0 1 1  35.355339,382.8223 A 55.053314 51.51778 0 1 1  145.46197 382.8223 z"
15
        transform="matrix(0.694344,0.719643,-0.167630,0.161737,328.1821,312.9174)" />
16
+   <circle fill="url(#gradient_1)" cx="90" cy="95" r="40"/>
17
   </g>
18
 </svg>
19
wxsvg-1.1.5.tar.bz2/svgview/svgview.cpp -> wxsvg-1.1.9.tar.bz2/svgview/svgview.cpp Changed
42
 
1
@@ -3,7 +3,7 @@
2
 // Purpose:     
3
 // Author:      Alex Thuering
4
 // Created:     15/01/2005
5
-// RCS-ID:      $Id: svgview.cpp,v 1.12 2011/10/31 18:48:13 ntalex Exp $
6
+// RCS-ID:      $Id: svgview.cpp,v 1.14 2012/04/01 20:37:00 ntalex Exp $
7
 // Copyright:   (c) Alex Thuering
8
 // Licence:     wxWindows licence
9
 //////////////////////////////////////////////////////////////////////////////
10
@@ -30,7 +30,7 @@
11
 
12
 #include "svgview.h"
13
 #include <wxSVG/svg.h>
14
-#ifdef USE_FFMPEG
15
+#ifdef USE_LIBAV
16
 #include <wxSVG/mediadec_ffmpeg.h>
17
 #endif
18
 
19
@@ -47,7 +47,7 @@
20
 #endif
21
   //wxLog::SetActiveTarget(new wxLogStderr);
22
   wxInitAllImageHandlers();
23
-#ifdef USE_FFMPEG
24
+#ifdef USE_LIBAV
25
   wxFfmpegMediaDecoder::Init();
26
 #endif
27
   
28
@@ -82,10 +82,10 @@
29
        wxFrame(parent, wxID_ANY, title, pos, size, style) {
30
     // Make a menubar
31
     wxMenu *fileMenu = new wxMenu;
32
-    fileMenu->Append(wxID_OPEN, _T("&Open..."));
33
-    fileMenu->Append(wxID_SAVE, _T("&Save as..."));
34
+    fileMenu->Append(wxID_OPEN, _T("&Open...\tCtrl-O"));
35
+    fileMenu->Append(wxID_SAVE, _T("&Save as...\tCtrl-S"));
36
     fileMenu->AppendSeparator();
37
-    fileMenu->Append(wxID_EXIT, _T("&Close"));
38
+    fileMenu->Append(wxID_EXIT, _T("&Exit\tAlt-X"));
39
     fileMenu->AppendSeparator();
40
     fileMenu->AppendCheckItem(wxID_FIT, _T("&FitToFrame"))->Check();
41
     fileMenu->AppendCheckItem(wxID_HITTEST, _T("&Hit-Test"));
42
wxsvg-1.1.5.tar.bz2/wxwin.m4 -> wxsvg-1.1.9.tar.bz2/wxwin.m4 Changed
874
 
1
@@ -4,10 +4,10 @@
2
 dnl     AC_ARG_ENABLE(...)
3
 dnl     AC_ARG_WITH(...)
4
 dnl        ...
5
-dnl     AM_OPTIONS_WXCONFIG
6
+dnl     WX_CONFIG_OPTIONS
7
 dnl        ...
8
 dnl        ...
9
-dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
10
+dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
11
 dnl     if test "$wxWin" != 1; then
12
 dnl        AC_MSG_ERROR(
13
 dnl                wxWidgets must be installed on your system
14
@@ -24,16 +24,46 @@
15
 dnl     CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
16
 dnl
17
 dnl     LIBS="$LIBS $WX_LIBS"
18
+dnl
19
+dnl If you want to support standard --enable-debug/unicode/shared options, you
20
+dnl may do the following:
21
+dnl
22
+dnl     ...
23
+dnl     AC_CANONICAL_SYSTEM
24
+dnl
25
+dnl     # define configure options
26
+dnl     WX_CONFIG_OPTIONS
27
+dnl     WX_STANDARD_OPTIONS(debug,unicode,shared,toolkit,wxshared)
28
+dnl
29
+dnl     # basic configure checks
30
+dnl     ...
31
+dnl
32
+dnl     # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE
33
+dnl     WX_DEBUG=$DEBUG
34
+dnl     WX_UNICODE=$UNICODE
35
+dnl
36
+dnl     WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
37
+dnl     WX_CONFIG_CHECK(2.8.0, wxWin=1,,html,core,net,base,$WXCONFIG_FLAGS)
38
+dnl     WX_DETECT_STANDARD_OPTION_VALUES
39
+dnl
40
+dnl     # write the output files
41
+dnl     AC_CONFIG_FILES(Makefile ...)
42
+dnl     AC_OUTPUT
43
+dnl
44
+dnl     # optional: just to show a message to the user
45
+dnl     WX_STANDARD_OPTIONS_SUMMARY_MSG
46
+dnl
47
 dnl ---------------------------------------------------------------------------
48
 
49
+
50
 dnl ---------------------------------------------------------------------------
51
-dnl AM_OPTIONS_WXCONFIG
52
+dnl WX_CONFIG_OPTIONS
53
 dnl
54
 dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and
55
 dnl --wx-config command line options
56
 dnl ---------------------------------------------------------------------------
57
 
58
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
59
+AC_DEFUN(WX_CONFIG_OPTIONS,
60
 
61
     AC_ARG_WITH(wxdir,
62
                   --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH,
63
@@ -76,7 +106,7 @@
64
 )
65
 
66
 dnl ---------------------------------------------------------------------------
67
-dnl AM_PATH_WXCONFIG(VERSION, ACTION-IF-FOUND , ACTION-IF-NOT-FOUND
68
+dnl WX_CONFIG_CHECK(VERSION, ACTION-IF-FOUND , ACTION-IF-NOT-FOUND
69
 dnl                  , WX-LIBS , ADDITIONAL-WX-CONFIG-FLAGS)
70
 dnl
71
 dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC
72
@@ -86,23 +116,23 @@
73
 dnl case the macro won't even waste time on tests for its existence.
74
 dnl
75
 dnl Optional WX-LIBS argument contains comma- or space-separated list of
76
-dnl wxWidgets libraries to link against (it may include contrib libraries). If
77
-dnl it is not specified then WX_LIBS and WX_LIBS_STATIC will contain flags to
78
-dnl link with all of the core wxWidgets libraries.
79
+dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS
80
+dnl and WX_LIBS_STATIC will contain flags to link with all of the core
81
+dnl wxWidgets libraries.
82
 dnl
83
 dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config
84
 dnl invocation command in present. It can be used to fine-tune lookup of
85
 dnl best wxWidgets build available.
86
 dnl
87
 dnl Example use:
88
-dnl   AM_PATH_WXCONFIG(2.6.0, wxWin=1, wxWin=0, html,core,net
89
+dnl   WX_CONFIG_CHECK(2.6.0, wxWin=1, wxWin=0, html,core,net
90
 dnl                    --unicode --debug)
91
 dnl ---------------------------------------------------------------------------
92
 
93
 dnl
94
 dnl Get the cflags and libraries from the wx-config script
95
 dnl
96
-AC_DEFUN(AM_PATH_WXCONFIG,
97
+AC_DEFUN(WX_CONFIG_CHECK,
98
 
99
   dnl do we have wx-config name: it can be wx-config or wxd-config or ...
100
   if test x${WX_CONFIG_NAME+set} != xset ; then
101
@@ -145,7 +175,9 @@
102
       AC_MSG_CHECKING(for wxWidgets version >= $min_wx_version ($5))
103
     fi
104
 
105
-    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5 $4"
106
+    dnl don't add the libraries ($4) to this variable as this would result in
107
+    dnl an error when it's used with --version below
108
+    WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5"
109
 
110
     WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null`
111
     wx_config_major_version=`echo $WX_VERSION | \
112
@@ -167,16 +199,15 @@
113
                               $wx_requested_micro_version)
114
 
115
     if test -n "$wx_ver_ok"; then
116
-
117
       AC_MSG_RESULT(yes (version $WX_VERSION))
118
-      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs`
119
+      WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4`
120
 
121
       dnl is this even still appropriate?  --static is a real option now
122
       dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is
123
       dnl what the user actually wants, making this redundant at best.
124
       dnl For now keep it in case anyone actually used it in the past.
125
       AC_MSG_CHECKING(for wxWidgets static library)
126
-      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs 2>/dev/null`
127
+      WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null`
128
       if test "x$WX_LIBS_STATIC" = "x"; then
129
         AC_MSG_RESULT(no)
130
       else
131
@@ -221,7 +252,7 @@
132
 
133
       if test "x$wx_has_cppflags" = x ; then
134
          dnl no choice but to define all flags like CFLAGS
135
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
136
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
137
          WX_CPPFLAGS=$WX_CFLAGS
138
          WX_CXXFLAGS=$WX_CFLAGS
139
 
140
@@ -229,9 +260,9 @@
141
          WX_CXXFLAGS_ONLY=$WX_CFLAGS
142
       else
143
          dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS
144
-         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags`
145
-         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags`
146
-         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags`
147
+         WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4`
148
+         WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4`
149
+         WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4`
150
 
151
          WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"`
152
          WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"`
153
@@ -254,7 +285,32 @@
154
        WX_LIBS=""
155
        WX_LIBS_STATIC=""
156
        WX_RESCOMP=""
157
-       ifelse($3, , :, $3)
158
+
159
+       if test ! -z "$5"; then
160
+
161
+          wx_error_message="
162
+    The configuration you asked for $PACKAGE_NAME requires a wxWidgets
163
+    build with the following settings:
164
+        $5
165
+    but such build is not available.
166
+
167
+    To see the wxWidgets builds available on this system, please use
168
+    'wx-config --list' command. To use the default build, returned by
169
+    'wx-config --selected-config', use the options with their 'auto'
170
+    default values."
171
+
172
+       fi
173
+
174
+       wx_error_message="
175
+    The requested wxWidgets build couldn't be found.
176
+    $wx_error_message
177
+
178
+    If you still get this error, then check that 'wx-config' is
179
+    in path, the directory where wxWidgets libraries are installed
180
+    (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH
181
+    or equivalent variable and wxWidgets version is $1 or above."
182
+
183
+       ifelse($3, , AC_MSG_ERROR($wx_error_message), $3)
184
 
185
     fi
186
   else
187
@@ -279,6 +335,15 @@
188
   AC_SUBST(WX_LIBS_STATIC)
189
   AC_SUBST(WX_VERSION)
190
   AC_SUBST(WX_RESCOMP)
191
+
192
+  dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols
193
+  dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness):
194
+  WX_VERSION_MAJOR="$wx_config_major_version"
195
+  WX_VERSION_MINOR="$wx_config_minor_version"
196
+  WX_VERSION_MICRO="$wx_config_micro_version"
197
+  AC_SUBST(WX_VERSION_MAJOR)
198
+  AC_SUBST(WX_VERSION_MINOR)
199
+  AC_SUBST(WX_VERSION_MICRO)
200
 )
201
 
202
 dnl ---------------------------------------------------------------------------
203
@@ -288,9 +353,9 @@
204
 dnl     AC_ARG_ENABLE(...)
205
 dnl     AC_ARG_WITH(...)
206
 dnl        ...
207
-dnl     AM_OPTIONS_WXCONFIG
208
+dnl     WX_CONFIG_OPTIONS
209
 dnl        ...
210
-dnl     AM_PATH_WXCONFIG(2.6.0, wxWin=1)
211
+dnl     WX_CONFIG_CHECK(2.6.0, wxWin=1)
212
 dnl     if test "$wxWin" != 1; then
213
 dnl        AC_MSG_ERROR(
214
 dnl                wxWidgets must be installed on your system
215
@@ -303,11 +368,11 @@
216
 dnl        )
217
 dnl     fi
218
 dnl
219
-dnl     AM_PATH_WXRC(HAVE_WXRC=1, HAVE_WXRC=0)
220
+dnl     WXRC_CHECK(HAVE_WXRC=1, HAVE_WXRC=0)
221
 dnl     if test "x$HAVE_WXRC" != x1; then
222
 dnl         AC_MSG_ERROR(
223
 dnl                The wxrc program was not installed or not found.
224
-dnl     
225
+dnl
226
 dnl                Please check the wxWidgets installation.
227
 dnl         )
228
 dnl     fi
229
@@ -319,32 +384,30 @@
230
 dnl     LDFLAGS="$LDFLAGS $WX_LIBS"
231
 dnl ---------------------------------------------------------------------------
232
 
233
-
234
-
235
 dnl ---------------------------------------------------------------------------
236
-dnl AM_PATH_WXRC(ACTION-IF-FOUND , ACTION-IF-NOT-FOUND)
237
+dnl WXRC_CHECK(ACTION-IF-FOUND , ACTION-IF-NOT-FOUND)
238
 dnl
239
 dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS
240
 dnl resources.  The variable WXRC will be set and substituted in the configure
241
 dnl script and Makefiles.
242
 dnl
243
 dnl Example use:
244
-dnl   AM_PATH_WXRC(wxrc=1, wxrc=0)
245
+dnl   WXRC_CHECK(wxrc=1, wxrc=0)
246
 dnl ---------------------------------------------------------------------------
247
 
248
 dnl
249
 dnl wxrc program from the wx-config script
250
 dnl
251
-AC_DEFUN(AM_PATH_WXRC,
252
+AC_DEFUN(WXRC_CHECK,
253
 
254
   AC_ARG_VAR(WXRC, Path to wxWidget's wxrc resource compiler)
255
-    
256
+
257
   if test "x$WX_CONFIG_NAME" = x; then
258
     AC_MSG_ERROR(The wxrc tests must run after wxWidgets test.)
259
   else
260
-    
261
+
262
     AC_MSG_CHECKING(for wxrc)
263
-    
264
+
265
     if test "x$WXRC" = x ; then
266
       dnl wx-config --utility is a new addition to wxWidgets:
267
       _WX_PRIVATE_CHECK_VERSION(2,5,3)
268
@@ -360,7 +423,604 @@
269
       AC_MSG_RESULT($WXRC)
270
       ifelse($1, , :, $1)
271
     fi
272
-    
273
+
274
     AC_SUBST(WXRC)
275
   fi
276
 )
277
+
278
+dnl ---------------------------------------------------------------------------
279
+dnl WX_LIKE_LIBNAME(output-var prefix, name)
280
+dnl
281
+dnl Sets the "output-var" variable to the name of a library named with same
282
+dnl wxWidgets rule.
283
+dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets
284
+dnl      the $lib variable to:
285
+dnl          'mine_gtk2ud_test-2.8'
286
+dnl      if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28
287
+dnl ---------------------------------------------------------------------------
288
+AC_DEFUN(WX_LIKE_LIBNAME,
289
+    
290
+        wx_temp="$2""_""$WX_PORT"
291
+
292
+        dnl add the ud string
293
+        if test "$WX_UNICODE" = "1"; then
294
+            wx_temp="$wx_temp""u"
295
+        fi
296
+        if test "$WX_DEBUG" = "1"; then
297
+            wx_temp="$wx_temp""d"
298
+        fi
299
+
300
+        dnl complete the name of the lib
301
+        wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR"
302
+
303
+        dnl save it in the user's variable
304
+        $1=$wx_temp
305
+    )
306
+
307
+dnl ---------------------------------------------------------------------------
308
+dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO
309
+dnl
310
+dnl Two little custom macros which define the ENABLE/WITH configure arguments.
311
+dnl Macro arguments:
312
+dnl $1 = the name of the --enable / --with  feature
313
+dnl $2 = the name of the variable associated
314
+dnl $3 = the description of that feature
315
+dnl $4 = the default value for that feature
316
+dnl $5 = additional action to do in case option is given with "yes" value
317
+dnl ---------------------------------------------------------------------------
318
+AC_DEFUN(WX_ARG_ENABLE_YESNOAUTO,
319
+         AC_ARG_ENABLE($1,
320
+            AC_HELP_STRING(--enable-$1, $3 (default is $4)),
321
+            , enableval="$4")
322
+
323
+            dnl Show a message to the user about this option
324
+            AC_MSG_CHECKING(for the --enable-$1 option)
325
+            if test "$enableval" = "yes" ; then
326
+                AC_MSG_RESULT(yes)
327
+                $2=1
328
+                $5
329
+            elif test "$enableval" = "no" ; then
330
+                AC_MSG_RESULT(no)
331
+                $2=0
332
+            elif test "$enableval" = "auto" ; then
333
+                AC_MSG_RESULT(will be automatically detected)
334
+                $2="auto"
335
+            else
336
+                AC_MSG_ERROR(
337
+    Unrecognized option value (allowed values: yes, no, auto)
338
+                )
339
+            fi
340
+         )
341
+
342
+AC_DEFUN(WX_ARG_WITH_YESNOAUTO,
343
+         AC_ARG_WITH($1,
344
+            AC_HELP_STRING(--with-$1, $3 (default is $4)),
345
+            , withval="$4")
346
+
347
+            dnl Show a message to the user about this option
348
+            AC_MSG_CHECKING(for the --with-$1 option)
349
+            if test "$withval" = "yes" ; then
350
+                AC_MSG_RESULT(yes)
351
+                $2=1
352
+                $5
353
+            dnl NB: by default we don't allow --with-$1=no option
354
+            dnl     since it does not make much sense !
355
+            elif test "$6" = "1" -a "$withval" = "no" ; then
356
+                AC_MSG_RESULT(no)
357
+                $2=0
358
+            elif test "$withval" = "auto" ; then
359
+                AC_MSG_RESULT(will be automatically detected)
360
+                $2="auto"
361
+            else
362
+                AC_MSG_ERROR(
363
+    Unrecognized option value (allowed values: yes, auto)
364
+                )
365
+            fi
366
+         )
367
+
368
+
369
+dnl ---------------------------------------------------------------------------
370
+dnl WX_STANDARD_OPTIONS(options-to-add)
371
+dnl
372
+dnl Adds to the configure script one or more of the following options:
373
+dnl   --enable-debug|unicode|shared|wxshared|wxdebug
374
+dnl   --with-gtk|msw|motif|x11|mac|mgl|dfb
375
+dnl   --with-wxversion
376
+dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED,
377
+dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values.
378
+dnl
379
+dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the
380
+dnl --enable-unicode option (in boolean format) while the second indicates
381
+dnl if wxWidgets was built in Unicode mode (and still is in boolean format).
382
+dnl ---------------------------------------------------------------------------
383
+AC_DEFUN(WX_STANDARD_OPTIONS,
384
+        
385
+
386
+        dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if
387
+        dnl the $1 argument contains respectively the debug,unicode or shared options.
388
+
389
+        dnl be careful here not to set debug flag if only "wxdebug" was specified
390
+        ifelse(regexp($1, \bdebug), -1,,
391
+               WX_ARG_ENABLE_YESNOAUTO(debug, DEBUG, Build in debug mode, auto))
392
+
393
+        ifelse(index($1, unicode), -1,,
394
+               WX_ARG_ENABLE_YESNOAUTO(unicode, UNICODE, Build in Unicode mode, auto))
395
+
396
+        ifelse(regexp($1, \bshared), -1,,
397
+               WX_ARG_ENABLE_YESNOAUTO(shared, SHARED, Build as shared library, auto))
398
+
399
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option
400
+        dnl which must be able to accept the auto|gtk1|gtk2|msw|... values
401
+        ifelse(index($1, toolkit), -1,,
402
+               
403
+                AC_ARG_WITH(toolkit,
404
+                            AC_HELP_STRING(--with-toolkit,
405
+                                           Build against a specific wxWidgets toolkit (default is auto)),
406
+                            , withval="auto")
407
+
408
+                dnl Show a message to the user about this option
409
+                AC_MSG_CHECKING(for the --with-toolkit option)
410
+                if test "$withval" = "auto" ; then
411
+                    AC_MSG_RESULT(will be automatically detected)
412
+                    TOOLKIT="auto"
413
+                else
414
+                    TOOLKIT="$withval"
415
+
416
+                    dnl PORT must be one of the allowed values
417
+                    if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \
418
+                            "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \
419
+                            "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \
420
+                            "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then
421
+                        AC_MSG_ERROR(
422
+    Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb)
423
+                        )
424
+                    fi
425
+
426
+                    AC_MSG_RESULT($TOOLKIT)
427
+                fi
428
+               )
429
+
430
+        dnl ****** IMPORTANT *******
431
+        dnl   Unlike for the UNICODE setting, you can build your program in
432
+        dnl   shared mode against a static build of wxWidgets. Thus we have the
433
+        dnl   following option which allows these mixtures. E.g.
434
+        dnl
435
+        dnl      ./configure --disable-shared --with-wxshared
436
+        dnl
437
+        dnl   will build your library in static mode against the first available
438
+        dnl   shared build of wxWidgets.
439
+        dnl
440
+        dnl   Note that's not possible to do the viceversa:
441
+        dnl
442
+        dnl      ./configure --enable-shared --without-wxshared
443
+        dnl
444
+        dnl   Doing so you would try to build your library in shared mode against a static
445
+        dnl   build of wxWidgets. This is not possible (you would mix PIC and non PIC code) !
446
+        dnl   A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES
447
+        dnl   (where we know what 'auto' should be expanded to).
448
+        dnl
449
+        dnl   If you try to build something in ANSI mode against a UNICODE build
450
+        dnl   of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets,
451
+        dnl   then at best you'll get ton of linking errors !
452
+        dnl ************************
453
+
454
+        ifelse(index($1, wxshared), -1,,
455
+               
456
+                WX_ARG_WITH_YESNOAUTO(
457
+                    wxshared, WX_SHARED,
458
+                    Force building against a shared build of wxWidgets, even if --disable-shared is given,
459
+                    auto, , 1)
460
+               )
461
+
462
+        dnl Just like for SHARED and WX_SHARED it may happen that some adventurous
463
+        dnl peoples will want to mix a wxWidgets release build with a debug build of
464
+        dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables.
465
+        ifelse(index($1, wxdebug), -1,,
466
+               
467
+                WX_ARG_WITH_YESNOAUTO(
468
+                    wxdebug, WX_DEBUG,
469
+                    Force building against a debug build of wxWidgets, even if --disable-debug is given,
470
+                    auto, , 1)
471
+               )
472
+
473
+        dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option
474
+        dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values
475
+        ifelse(index($1, wxversion), -1,,
476
+               
477
+                AC_ARG_WITH(wxversion,
478
+                            AC_HELP_STRING(--with-wxversion,
479
+                                           Build against a specific version of wxWidgets (default is auto)),
480
+                            , withval="auto")
481
+
482
+                dnl Show a message to the user about this option
483
+                AC_MSG_CHECKING(for the --with-wxversion option)
484
+                if test "$withval" = "auto" ; then
485
+                    AC_MSG_RESULT(will be automatically detected)
486
+                    WX_RELEASE="auto"
487
+                else
488
+
489
+                    wx_requested_major_version=`echo $withval | \
490
+                        sed 's/\(0-9*\).\(0-9*\).*/\1/'`
491
+                    wx_requested_minor_version=`echo $withval | \
492
+                        sed 's/\(0-9*\).\(0-9*\).*/\2/'`
493
+
494
+                    dnl both vars above must be exactly 1 digit
495
+                    if test "${#wx_requested_major_version}" != "1" -o \
496
+                            "${#wx_requested_minor_version}" != "1" ; then
497
+                        AC_MSG_ERROR(
498
+    Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0)
499
+                        )
500
+                    fi
501
+
502
+                    WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version"
503
+                    AC_MSG_RESULT($WX_RELEASE)
504
+                fi
505
+               )
506
+
507
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
508
+            echo "dbg DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG"
509
+            echo "dbg UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE"
510
+            echo "dbg SHARED: $SHARED, WX_SHARED: $WX_SHARED"
511
+            echo "dbg TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT"
512
+            echo "dbg VERSION: $VERSION, WX_RELEASE: $WX_RELEASE"
513
+        fi
514
+    )
515
+
516
+
517
+dnl ---------------------------------------------------------------------------
518
+dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS
519
+dnl
520
+dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values
521
+dnl which are different from "auto".
522
+dnl Thus this macro needs to be called only once all options have been set.
523
+dnl ---------------------------------------------------------------------------
524
+AC_DEFUN(WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS,
525
+        
526
+        if test "$WX_SHARED" = "1" ; then
527
+            WXCONFIG_FLAGS="--static=no "
528
+        elif test "$WX_SHARED" = "0" ; then
529
+            WXCONFIG_FLAGS="--static=yes "
530
+        fi
531
+
532
+        if test "$WX_DEBUG" = "1" ; then
533
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes "
534
+        elif test "$WX_DEBUG" = "0" ; then
535
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no "
536
+        fi
537
+
538
+        dnl The user should have set WX_UNICODE=UNICODE
539
+        if test "$WX_UNICODE" = "1" ; then
540
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes "
541
+        elif test "$WX_UNICODE" = "0" ; then
542
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no "
543
+        fi
544
+
545
+        if test "$TOOLKIT" != "auto" ; then
546
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT "
547
+        fi
548
+
549
+        if test "$WX_RELEASE" != "auto" ; then
550
+            WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE "
551
+        fi
552
+
553
+        dnl strip out the last space of the string
554
+        WXCONFIG_FLAGS=${WXCONFIG_FLAGS% }
555
+
556
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
557
+            echo "dbg WXCONFIG_FLAGS: $WXCONFIG_FLAGS"
558
+        fi
559
+    )
560
+
561
+
562
+dnl ---------------------------------------------------------------------------
563
+dnl _WX_SELECTEDCONFIG_CHECKFOR(RESULTVAR, STRING, MSG
564
+dnl                             , ACTION-IF-FOUND , ACTION-IF-NOT-FOUND)
565
+dnl
566
+dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets
567
+dnl additional CPP flags and put the result of the search in WX_$RESULTVAR
568
+dnl also adding the "yes" or "no" message result to MSG.
569
+dnl ---------------------------------------------------------------------------
570
+AC_DEFUN(_WX_SELECTEDCONFIG_CHECKFOR,
571
+        
572
+        if test "$$1" = "auto" ; then
573
+
574
+            dnl The user does not have particular preferences for this option;
575
+            dnl so we will detect the wxWidgets relative build setting and use it
576
+            AC_MSG_CHECKING($3)
577
+
578
+            dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2
579
+            dnl string or to 0 otherwise.
580
+            dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it
581
+            dnl       doesn't work; we use 'expr STRING : REGEXP' instead
582
+            WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*")
583
+
584
+            if test "$WX_$1" != "0"; then
585
+                WX_$1=1
586
+                AC_MSG_RESULT(yes)
587
+                ifelse($4, , :, $4)
588
+            else
589
+                WX_$1=0
590
+                AC_MSG_RESULT(no)
591
+                ifelse($5, , :, $5)
592
+            fi
593
+        else
594
+
595
+            dnl Use the setting given by the user
596
+            WX_$1=$$1
597
+        fi
598
+    )
599
+
600
+dnl ---------------------------------------------------------------------------
601
+dnl WX_DETECT_STANDARD_OPTION_VALUES
602
+dnl
603
+dnl Detects the values of the following variables:
604
+dnl 1) WX_RELEASE
605
+dnl 2) WX_UNICODE
606
+dnl 3) WX_DEBUG
607
+dnl 4) WX_SHARED    (and also WX_STATIC)
608
+dnl 5) WX_PORT
609
+dnl from the previously selected wxWidgets build; this macro in fact must be
610
+dnl called *after* calling the WX_CONFIG_CHECK macro.
611
+dnl
612
+dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set
613
+dnl by WX_CONFIG_CHECK macro
614
+dnl ---------------------------------------------------------------------------
615
+AC_DEFUN(WX_DETECT_STANDARD_OPTION_VALUES,
616
+        
617
+        dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits,
618
+        dnl            while WX_RELEASE only the major.minor ones.
619
+        WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR"
620
+        if test $WX_RELEASE -lt 26 ; then
621
+
622
+            AC_MSG_ERROR(
623
+    Cannot detect the wxWidgets configuration for the selected wxWidgets build
624
+    since its version is $WX_VERSION < 2.6.0; please install a newer
625
+    version of wxWidgets.
626
+                         )
627
+        fi
628
+
629
+        dnl The wx-config we are using understands the "--selected_config"
630
+        dnl option which returns an easy-parseable string !
631
+        WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config)
632
+
633
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
634
+            echo "dbg Using wx-config --selected-config"
635
+            echo "dbg WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG"
636
+        fi
637
+
638
+
639
+        dnl we could test directly for WX_SHARED with a line like:
640
+        dnl    _WX_SELECTEDCONFIG_CHECKFOR(SHARED, shared,
641
+        dnl                                if wxWidgets was built in SHARED mode)
642
+        dnl but wx-config --selected-config DOES NOT outputs the 'shared'
643
+        dnl word when wx was built in shared mode; it rather outputs the
644
+        dnl 'static' word when built in static mode.
645
+        if test $WX_SHARED = "1"; then
646
+            STATIC=0
647
+        elif test $WX_SHARED = "0"; then
648
+            STATIC=1
649
+        elif test $WX_SHARED = "auto"; then
650
+            STATIC="auto"
651
+        fi
652
+
653
+        dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables
654
+        _WX_SELECTEDCONFIG_CHECKFOR(UNICODE, unicode,
655
+                                    if wxWidgets was built with UNICODE enabled)
656
+        _WX_SELECTEDCONFIG_CHECKFOR(DEBUG, debug,
657
+                                    if wxWidgets was built in DEBUG mode)
658
+        _WX_SELECTEDCONFIG_CHECKFOR(STATIC, static,
659
+                                    if wxWidgets was built in STATIC mode)
660
+
661
+        dnl init WX_SHARED from WX_STATIC
662
+        if test "$WX_STATIC" != "0"; then
663
+            WX_SHARED=0
664
+        else
665
+            WX_SHARED=1
666
+        fi
667
+
668
+        AC_SUBST(WX_UNICODE)
669
+        AC_SUBST(WX_DEBUG)
670
+        AC_SUBST(WX_SHARED)
671
+
672
+        dnl detect the WX_PORT to use
673
+        if test "$TOOLKIT" = "auto" ; then
674
+
675
+            dnl The user does not have particular preferences for this option;
676
+            dnl so we will detect the wxWidgets relative build setting and use it
677
+            AC_MSG_CHECKING(which wxWidgets toolkit was selected)
678
+
679
+            WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*")
680
+            WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*")
681
+            WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*")
682
+            WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*")
683
+            WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*")
684
+            WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*")
685
+            WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*")
686
+            WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*")
687
+            WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*")
688
+
689
+            WX_PORT="unknown"
690
+            if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi
691
+            if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi
692
+            if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi
693
+            if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi
694
+            if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi
695
+            if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi
696
+            if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi
697
+            if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi
698
+            if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi
699
+
700
+            dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac
701
+            dnl       ports are called 'osx_cocoa' and 'osx_carbon' (see above)
702
+            WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*")
703
+            if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi
704
+
705
+            dnl check at least one of the WX_*PORT has been set !
706
+
707
+            if test "$WX_PORT" = "unknown" ; then
708
+                AC_MSG_ERROR(
709
+        Cannot detect the currently installed wxWidgets port !
710
+        Please check your 'wx-config --cxxflags'...
711
+                            )
712
+            fi
713
+
714
+            AC_MSG_RESULT($WX_PORT)
715
+        else
716
+
717
+            dnl Use the setting given by the user
718
+            if test -z "$TOOLKIT" ; then
719
+                WX_PORT=$TOOLKIT
720
+            else
721
+                dnl try with PORT
722
+                WX_PORT=$PORT
723
+            fi
724
+        fi
725
+
726
+        AC_SUBST(WX_PORT)
727
+
728
+        if test "$WX_DEBUG_CONFIGURE" = "1"; then
729
+            echo "dbg Values of all WX_* options after final detection:"
730
+            echo "dbg WX_DEBUG: $WX_DEBUG"
731
+            echo "dbg WX_UNICODE: $WX_UNICODE"
732
+            echo "dbg WX_SHARED: $WX_SHARED"
733
+            echo "dbg WX_RELEASE: $WX_RELEASE"
734
+            echo "dbg WX_PORT: $WX_PORT"
735
+        fi
736
+
737
+        dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when
738
+        dnl the user gives the options:
739
+        dnl      ./configure --enable-shared --without-wxshared
740
+        dnl or just do
741
+        dnl      ./configure --enable-shared
742
+        dnl but there is only a static build of wxWidgets available.
743
+        if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then
744
+            AC_MSG_ERROR(
745
+    Cannot build shared library against a static build of wxWidgets !
746
+    This error happens because the wxWidgets build which was selected
747
+    has been detected as static while you asked to build $PACKAGE_NAME
748
+    as shared library and this is not possible.
749
+    Use the '--disable-shared' option to build $PACKAGE_NAME
750
+    as static library or '--with-wxshared' to use wxWidgets as shared library.
751
+                         )
752
+        fi
753
+
754
+        dnl now we can finally update the DEBUG,UNICODE,SHARED options
755
+        dnl to their final values if they were set to 'auto'
756
+        if test "$DEBUG" = "auto"; then
757
+            DEBUG=$WX_DEBUG
758
+        fi
759
+        if test "$UNICODE" = "auto"; then
760
+            UNICODE=$WX_UNICODE
761
+        fi
762
+        if test "$SHARED" = "auto"; then
763
+            SHARED=$WX_SHARED
764
+        fi
765
+        if test "$TOOLKIT" = "auto"; then
766
+            TOOLKIT=$WX_PORT
767
+        fi
768
+
769
+        dnl in case the user needs a BUILD=debug/release var...
770
+        if test "$DEBUG" = "1"; then
771
+            BUILD="debug"
772
+        elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then
773
+            BUILD="release"
774
+        fi
775
+
776
+        dnl respect the DEBUG variable adding the optimize/debug flags
777
+        dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we
778
+        dnl       don't need to set them, too
779
+        if test "$DEBUG" = "1"; then
780
+            CXXFLAGS="$CXXFLAGS -g -O0"
781
+            CFLAGS="$CFLAGS -g -O0"
782
+        else
783
+            CXXFLAGS="$CXXFLAGS -O2"
784
+            CFLAGS="$CFLAGS -O2"
785
+        fi
786
+    )
787
+
788
+dnl ---------------------------------------------------------------------------
789
+dnl WX_BOOLOPT_SUMMARY(name of the boolean variable to show summary for,
790
+dnl                   what to print when var is 1,
791
+dnl                   what to print when var is 0)
792
+dnl
793
+dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0.
794
+dnl This macro mainly exists just to make configure.ac scripts more readable.
795
+dnl
796
+dnl NOTE: you need to use the " my message" syntax for 2nd and 3rd arguments
797
+dnl       if you want that m4 avoid to throw away the spaces prefixed to the
798
+dnl       argument value.
799
+dnl ---------------------------------------------------------------------------
800
+AC_DEFUN(WX_BOOLOPT_SUMMARY,
801
+        
802
+        if test "x$$1" = "x1" ; then
803
+            echo $2
804
+        elif test "x$$1" = "x0" ; then
805
+            echo $3
806
+        else
807
+            echo "$1 is $$1"
808
+        fi
809
+    )
810
+
811
+dnl ---------------------------------------------------------------------------
812
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG
813
+dnl
814
+dnl Shows a summary message to the user about the WX_* variable contents.
815
+dnl This macro is used typically at the end of the configure script.
816
+dnl ---------------------------------------------------------------------------
817
+AC_DEFUN(WX_STANDARD_OPTIONS_SUMMARY_MSG,
818
+        
819
+        echo
820
+        echo "  The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION"
821
+        echo "  has the following settings:"
822
+        WX_BOOLOPT_SUMMARY(WX_DEBUG,   "  - DEBUG build",  "  - RELEASE build")
823
+        WX_BOOLOPT_SUMMARY(WX_UNICODE, "  - UNICODE mode", "  - ANSI mode")
824
+        WX_BOOLOPT_SUMMARY(WX_SHARED,  "  - SHARED mode",  "  - STATIC mode")
825
+        echo "  - VERSION: $WX_VERSION"
826
+        echo "  - PORT: $WX_PORT"
827
+    )
828
+
829
+
830
+dnl ---------------------------------------------------------------------------
831
+dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END
832
+dnl
833
+dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info
834
+dnl about the configuration of the package which used the wxpresets.
835
+dnl
836
+dnl Typical usage:
837
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN
838
+dnl    echo "   - Package setting 1: $SETTING1"
839
+dnl    echo "   - Package setting 2: $SETTING1"
840
+dnl    ...
841
+dnl    WX_STANDARD_OPTIONS_SUMMARY_MSG_END
842
+dnl
843
+dnl ---------------------------------------------------------------------------
844
+AC_DEFUN(WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN,
845
+        
846
+        echo
847
+        echo " ----------------------------------------------------------------"
848
+        echo "  Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed."
849
+        echo "  Summary of main configuration settings for $PACKAGE_NAME:"
850
+        WX_BOOLOPT_SUMMARY(DEBUG, "  - DEBUG build", "  - RELEASE build")
851
+        WX_BOOLOPT_SUMMARY(UNICODE, "  - UNICODE mode", "  - ANSI mode")
852
+        WX_BOOLOPT_SUMMARY(SHARED, "  - SHARED mode", "  - STATIC mode")
853
+    )
854
+
855
+AC_DEFUN(WX_STANDARD_OPTIONS_SUMMARY_MSG_END,
856
+        
857
+        WX_STANDARD_OPTIONS_SUMMARY_MSG
858
+        echo
859
+        echo "  Now, just run make."
860
+        echo " ----------------------------------------------------------------"
861
+        echo
862
+    )
863
+
864
+
865
+dnl ---------------------------------------------------------------------------
866
+dnl Deprecated macro wrappers
867
+dnl ---------------------------------------------------------------------------
868
+
869
+AC_DEFUN(AM_OPTIONS_WXCONFIG, WX_CONFIG_OPTIONS)
870
+AC_DEFUN(AM_PATH_WXCONFIG, 
871
+    WX_CONFIG_CHECK($1,$2,$3,$4,$5)
872
+)
873
+AC_DEFUN(AM_PATH_WXRC, WXRC_CHECK($1,$2))
874
Refresh

No build results available

Refresh

No rpmlint results available

Request History
Mariusz Fik's avatar

Fisiu created request over 11 years ago

- Update to 1.1.9:
+ support for ffmpeg 0.11 and libav 0.9
- wxsvg-libtoolize-fix.patch updated
- Fixes since last package version on packman:
+ fixed memory leak and storing xml file
+ fixed rendering of radial gradients
+ fixed handling of aspect ratio of video
+ clipPath element and visibility style property supported


Peter Linnell's avatar

mrdocs accepted request about 12 years ago

Reviewed OK