Merge lp:~valavanisalex/ubuntu/oneiric/inkscape/inkscape_0.48.2-0ubuntu1 into lp:ubuntu/oneiric/inkscape

[Alex Valavanis]

Here is an updated version of the Ubuntu package, that contains several upstream bug fixes. I have also submitted a request to Debian, but we may want to go ahead with an Ubuntu upgrade while we wait for the Debian maintainer to push the changes through.

[Bryce Harrington (bryce)]

Looks good, thanks!

Upload sponsored for oneiric.

review: Approve (packaging)

=== modified file 'Info.plist'
--- Info.plist	2011-02-20 12:07:30 +0000
+++ Info.plist	2011-07-10 11:35:55 +0000
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>Inkscape</string>
     <key>CFBundleGetInfoString</key>
-    <string>0.48.1, Copyright 2003-2009 Inkscape Developers</string>
+    <string>0.48.2, Copyright 2003-2009 Inkscape Developers</string>
     <key>CFBundleIconFile</key>
     <string>Inkscape.icns</string>
     <key>CFBundleIdentifier</key>
@@ -323,11 +323,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.48.1</string>
+    <string>0.48.2</string>
     <key>CFBundleSignature</key>
     <string>Inks</string>
     <key>CFBundleVersion</key>
-    <string>0.48.1</string>
+    <string>0.48.2</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>

=== modified file 'Makefile.in'
--- Makefile.in	2011-02-20 12:07:30 +0000
+++ Makefile.in	2011-07-10 11:35:55 +0000
@@ -259,6 +259,10 @@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBWPG01_CFLAGS = @LIBWPG01_CFLAGS@
+LIBWPG01_LIBS = @LIBWPG01_LIBS@
+LIBWPG02_CFLAGS = @LIBWPG02_CFLAGS@
+LIBWPG02_LIBS = @LIBWPG02_LIBS@
 LIBWPG_CFLAGS = @LIBWPG_CFLAGS@
 LIBWPG_LIBS = @LIBWPG_LIBS@
 LTLIBOBJS = @LTLIBOBJS@

=== modified file 'aclocal.m4'
--- aclocal.m4	2011-02-20 12:07:30 +0000
+++ aclocal.m4	2011-07-10 11:35:55 +0000
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -707,7 +707,8 @@
 # ----------------------------------
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -753,7 +754,8 @@
     pkg_cv_[]$1="$$1"
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
 		     [pkg_failed=yes])
  else
     pkg_failed=untried
@@ -801,9 +803,9 @@
    	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
         else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

=== modified file 'build.xml'
--- build.xml	2011-02-01 12:53:34 +0000
+++ build.xml	2011-07-10 11:35:55 +0000
@@ -42,7 +42,7 @@
     </description>
 
   <!-- set global properties for this build -->
-  <property name="version"       value="0.48.1"/>
+  <property name="version"       value="0.48.2"/>
   <property name="src"           location="src"/>
   <property name="lib"           location="lib"/>
   <property name="build"         location="build"/>
@@ -186,6 +186,9 @@
         /* Allow reading WordPerfect? */
         #define WITH_LIBWPG                   1
 
+        /* Default  to libwpg 0.1.x */
+        #define WITH_LIBWPG01                 1
+
         /* Do we support SVG Fonts? */
         #define ENABLE_SVG_FONTS              1
 
@@ -660,6 +663,7 @@
     <copy todir="${dist}" file="${devlibs}/bin/libsigc-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/freetype6.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libatk-1.0-0.dll"/>
+    <copy todir="${dist}" file="${devlibs}/bin/libgcc_s_sjlj-1.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgdk-win32-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libgdk_pixbuf-2.0-0.dll"/>
     <copy todir="${dist}" file="${devlibs}/bin/libglib-2.0-0.dll"/>
@@ -704,7 +708,7 @@
     <copy file="${devlibs}/bin/intl.dll" tofile="${dist}/libintl-2.dll"/>
     <!-- MINGW support DLLs needed for openmp support  -->
     <copy todir="${dist}" file="${mingw_bin}/mingwm10.dll"/>
-	<copy todir="${dist}" file="${mingw}/lib/gcc/mingw32/bin/libgomp-1.dll"/>
+    <copy todir="${dist}" file="${mingw_bin}/libgomp-1.dll"/>
 
     <!-- MSGFMT files -->
     <copy todir="${dist}">

=== modified file 'config.guess'
--- config.guess	2011-02-20 12:07:30 +0000
+++ config.guess	2011-07-10 11:35:55 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2011-05-11'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -57,7 +57,7 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -181,7 +181,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +224,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +270,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +299,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +398,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +484,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +498,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -552,7 +555,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,52 +598,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +734,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +773,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -805,14 +808,14 @@
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -867,7 +870,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,7 +882,13 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
@@ -892,7 +901,7 @@
 	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo frv-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -960,7 +969,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,6 +977,9 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-tilera-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
@@ -975,7 +987,7 @@
 	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +996,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1020,7 +1032,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1048,13 +1060,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1089,8 +1101,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1133,10 +1145,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <[e-mail]>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <[e-mail]>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <[e-mail]>.
 	# How about differentiating between stratus architectures? -djm
@@ -1162,11 +1174,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1231,6 +1243,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1276,13 +1291,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1322,11 +1337,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 

=== modified file 'config.h.in'
--- config.h.in	2011-02-20 12:07:30 +0000
+++ config.h.in	2011-07-10 11:35:55 +0000
@@ -285,6 +285,12 @@
 /* Build in libwpg */
 #undef WITH_LIBWPG
 
+/* Build in libwpg 0.1.x */
+#undef WITH_LIBWPG01
+
+/* Build in libwpg 0.2.x */
+#undef WITH_LIBWPG02
+
 /* use Perl for embedded scripting */
 #undef WITH_PERL
 

=== modified file 'config.sub'
--- config.sub	2011-02-20 12:07:30 +0000
+++ config.sub	2011-07-10 11:35:55 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011 Free Software Foundation, Inc.
 
-timestamp='2010-01-22'
+timestamp='2011-03-23'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -76,7 +76,7 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -124,8 +124,9 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -157,8 +158,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -174,10 +175,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -282,11 +283,13 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
 	| rx \
 	| score \
@@ -294,15 +297,24 @@
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
@@ -314,6 +326,18 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -334,7 +358,7 @@
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
@@ -368,26 +392,28 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
 	| romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tile-* | tilegx-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -412,7 +438,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -482,11 +508,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -518,7 +553,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -734,7 +769,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -841,6 +876,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -923,9 +964,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1019,6 +1061,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1075,20 +1120,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-        # This must be matched before tile*.
-        tilegx*)
+	# This must be matched before tile*.
+	tilegx*)
 		basic_machine=tilegx-unknown
 		os=-linux-gnu
 		;;
@@ -1163,6 +1196,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1260,11 +1296,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1301,7 +1337,8 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1385,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1397,7 +1434,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1442,8 +1479,8 @@
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1466,10 +1503,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1481,8 +1518,17 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1509,7 +1555,7 @@
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1536,7 +1582,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)

=== modified file 'configure'
--- configure	2011-02-20 12:07:30 +0000
+++ configure	2011-07-10 11:35:55 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for inkscape 0.48.1.
+# Generated by GNU Autoconf 2.68 for inkscape 0.48.2.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -214,11 +215,18 @@
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -549,8 +557,8 @@
 # Identity of this package.
 PACKAGE_NAME='inkscape'
 PACKAGE_TARNAME='inkscape'
-PACKAGE_VERSION='0.48.1'
-PACKAGE_STRING='inkscape 0.48.1'
+PACKAGE_VERSION='0.48.2'
+PACKAGE_STRING='inkscape 0.48.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -613,8 +621,16 @@
 IMAGEMAGICK_CFLAGS
 WITH_LIBWPG_FALSE
 WITH_LIBWPG_TRUE
+WITH_LIBWPG02_FALSE
+WITH_LIBWPG02_TRUE
+LIBWPG02_LIBS
+LIBWPG02_CFLAGS
+WITH_LIBWPG01_FALSE
+WITH_LIBWPG01_TRUE
+LIBWPG_CFLAGS
 LIBWPG_LIBS
-LIBWPG_CFLAGS
+LIBWPG01_LIBS
+LIBWPG01_CFLAGS
 INKBOARD_CFLAGS
 INKBOARD_LIBS
 POPPLER_GFXFONT_LIBS
@@ -653,6 +669,8 @@
 PKG_CONFIG_PATH
 PLATFORM_SOLARIS_FALSE
 PLATFORM_SOLARIS_TRUE
+PLATFORM_OSX_FALSE
+PLATFORM_OSX_TRUE
 WIN32_CFLAGS
 PLATFORM_WIN32_FALSE
 PLATFORM_WIN32_TRUE
@@ -858,8 +876,10 @@
 POPPLER_CAIRO_LIBS
 POPPLER_GFXFONT_CFLAGS
 POPPLER_GFXFONT_LIBS
-LIBWPG_CFLAGS
-LIBWPG_LIBS
+LIBWPG01_CFLAGS
+LIBWPG01_LIBS
+LIBWPG02_CFLAGS
+LIBWPG02_LIBS
 IMAGEMAGICK_CFLAGS
 IMAGEMAGICK_LIBS
 CAIRO_USER_FONTS_CFLAGS
@@ -1272,7 +1292,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1410,7 +1430,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures inkscape 0.48.1 to adapt to many kinds of systems.
+\`configure' configures inkscape 0.48.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1480,7 +1500,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of inkscape 0.48.1:";;
+     short | recursive ) echo "Configuration of inkscape 0.48.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1558,9 +1578,14 @@
               C compiler flags for POPPLER_GFXFONT, overriding pkg-config
   POPPLER_GFXFONT_LIBS
               linker flags for POPPLER_GFXFONT, overriding pkg-config
-  LIBWPG_CFLAGS
-              C compiler flags for LIBWPG, overriding pkg-config
-  LIBWPG_LIBS linker flags for LIBWPG, overriding pkg-config
+  LIBWPG01_CFLAGS
+              C compiler flags for LIBWPG01, overriding pkg-config
+  LIBWPG01_LIBS
+              linker flags for LIBWPG01, overriding pkg-config
+  LIBWPG02_CFLAGS
+              C compiler flags for LIBWPG02, overriding pkg-config
+  LIBWPG02_LIBS
+              linker flags for LIBWPG02, overriding pkg-config
   IMAGEMAGICK_CFLAGS
               C compiler flags for IMAGEMAGICK, overriding pkg-config
   IMAGEMAGICK_LIBS
@@ -1644,8 +1669,8 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-inkscape configure 0.48.1
-generated by GNU Autoconf 2.67
+inkscape configure 0.48.2
+generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1691,7 +1716,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1737,7 +1762,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
@@ -1775,7 +1800,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1788,7 +1813,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1843,7 +1868,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_func
 
@@ -1879,7 +1904,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -1921,7 +1946,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_run
@@ -1967,7 +1992,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1980,10 +2005,10 @@
 ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2046,7 +2071,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2055,7 +2080,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
 
@@ -2068,7 +2093,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2086,7 +2111,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_compile
 
@@ -2099,7 +2124,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval "test \"\${$4+set}\"" = set; then :
+if eval \${$4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2143,7 +2168,7 @@
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_member
 
@@ -2156,7 +2181,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -2197,15 +2222,15 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_type
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by inkscape $as_me 0.48.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+It was created by inkscape $as_me 0.48.2, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2463,7 +2488,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2588,7 +2613,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -2604,7 +2629,7 @@
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -2622,7 +2647,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -2637,7 +2662,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -2673,7 +2698,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2760,11 +2785,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2850,7 +2875,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2890,7 +2915,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2943,7 +2968,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2994,7 +3019,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3034,7 +3059,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3092,7 +3117,7 @@
 
 # Define the identity of the package.
  PACKAGE='inkscape'
- VERSION='0.48.1'
+ VERSION='0.48.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3200,7 +3225,7 @@
 done
 rm -rf conftest.dir
 
-if test "${am_cv_prog_tar_pax+set}" = set; then :
+if ${am_cv_prog_tar_pax+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_pax=$_am_tool
@@ -3313,7 +3338,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -3357,7 +3382,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -3521,7 +3546,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3564,7 +3589,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3623,7 +3648,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3634,7 +3659,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3675,7 +3700,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3685,7 +3710,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3722,7 +3747,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3808,7 +3833,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3934,7 +3959,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5
 $as_echo_n "checking for library containing strerror... " >&6; }
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -3968,11 +3993,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then :
+  if ${ac_cv_search_strerror+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then :
+if ${ac_cv_search_strerror+:} false; then :
 
 else
   ac_cv_search_strerror=no
@@ -4004,7 +4029,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -4048,7 +4073,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -4126,7 +4151,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4163,7 +4188,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -4249,7 +4274,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4382,7 +4407,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4422,7 +4447,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4475,7 +4500,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4515,7 +4540,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4574,7 +4599,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4618,7 +4643,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4673,7 +4698,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4702,7 +4727,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4739,7 +4764,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4817,7 +4842,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4916,7 +4941,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5053,7 +5078,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CCAS_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CCAS_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5179,7 +5204,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -5219,7 +5244,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -5308,7 +5333,7 @@
 set dummy intltool-update; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -5348,7 +5373,7 @@
 set dummy intltool-merge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_MERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -5388,7 +5413,7 @@
 set dummy intltool-extract; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -5549,7 +5574,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -5589,7 +5614,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+if ${ac_cv_path_MSGMERGE+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -5629,7 +5654,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -5669,7 +5694,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -5720,7 +5745,7 @@
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+if ${ac_cv_path_INTLTOOL_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -5804,7 +5829,7 @@
   case $host in
     *-*-solaris*)
                         ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   DATADIRNAME=share
 else
   DATADIRNAME=lib
@@ -5832,7 +5857,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  if ${ac_cv_prog_CXXCPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -5948,7 +5973,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=cpp
@@ -5960,7 +5985,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -6023,7 +6048,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -6090,7 +6115,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6203,7 +6228,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZR snapshot build" >&5
 $as_echo_n "checking for BZR snapshot build... " >&6; }
-if test "${ink_cv_bzr_snapshot_build+set}" = set; then :
+if ${ink_cv_bzr_snapshot_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ink_cv_bzr_snapshot_build=no
@@ -6247,7 +6272,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6287,7 +6312,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6340,7 +6365,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6380,7 +6405,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6439,7 +6464,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -6483,7 +6508,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -6538,7 +6563,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -6567,7 +6592,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6604,7 +6629,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -6682,7 +6707,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -6781,7 +6806,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -6913,7 +6938,7 @@
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7230,7 +7255,7 @@
 
 
 ac_fn_cxx_check_header_mongrel "$LINENO" "boost/unordered_set.hpp" "ac_cv_header_boost_unordered_set_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_unordered_set_hpp" = x""yes; then :
+if test "x$ac_cv_header_boost_unordered_set_hpp" = xyes; then :
 
 $as_echo "#define HAVE_BOOST_UNORDERED_SET 1" >>confdefs.h
 
@@ -7238,7 +7263,7 @@
 
 
 ac_fn_cxx_check_header_mongrel "$LINENO" "ext/hash_set" "ac_cv_header_ext_hash_set" "$ac_includes_default"
-if test "x$ac_cv_header_ext_hash_set" = x""yes; then :
+if test "x$ac_cv_header_ext_hash_set" = xyes; then :
 
 $as_echo "#define HAVE_EXT_HASH_SET 1" >>confdefs.h
 
@@ -7289,7 +7314,7 @@
    for ac_header in locale.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
-if test "x$ac_cv_header_locale_h" = x""yes; then :
+if test "x$ac_cv_header_locale_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LOCALE_H 1
 _ACEOF
@@ -7301,7 +7326,7 @@
     if test $ac_cv_header_locale_h = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
 $as_echo_n "checking for LC_MESSAGES... " >&6; }
-if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+if ${am_cv_val_LC_MESSAGES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7341,7 +7366,7 @@
     INTLLIBS=
 
     ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
@@ -7350,7 +7375,7 @@
       #
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
 $as_echo_n "checking for ngettext in libc... " >&6; }
-if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+if ${gt_cv_func_ngettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7381,7 +7406,7 @@
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
 	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
 $as_echo_n "checking for dgettext in libc... " >&6; }
-if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+if ${gt_cv_func_dgettext_libc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7414,7 +7439,7 @@
         for ac_func in bind_textdomain_codeset
 do :
   ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -7433,7 +7458,7 @@
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7467,10 +7492,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
+if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7504,10 +7529,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7541,7 +7566,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -7557,7 +7582,7 @@
 $as_echo "" >&6; }
   	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
 $as_echo_n "checking for ngettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+if ${ac_cv_lib_intl_ngettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7591,10 +7616,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
 $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_ngettext" = xyes; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
 $as_echo_n "checking for dcgettext in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+if ${ac_cv_lib_intl_dcgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7628,7 +7653,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+if test "x$ac_cv_lib_intl_dcgettext" = xyes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -7653,7 +7678,7 @@
           for ac_func in bind_textdomain_codeset
 do :
   ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -7691,7 +7716,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -7728,7 +7753,7 @@
 	  for ac_func in dcgettext
 do :
   ac_fn_cxx_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
-if test "x$ac_cv_func_dcgettext" = x""yes; then :
+if test "x$ac_cv_func_dcgettext" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_DCGETTEXT 1
 _ACEOF
@@ -7769,7 +7794,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -7810,7 +7835,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+if ${ac_cv_path_XGETTEXT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -7861,7 +7886,7 @@
   case $host in
 	    *-*-solaris*)
 	    	                	    	                ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -7994,7 +8019,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -8039,7 +8064,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_MSGFMT+set}" = set; then :
+if ${ac_cv_path_MSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -8080,7 +8105,7 @@
 set dummy gmsgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+if ${ac_cv_path_GMSGFMT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -8122,7 +8147,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenMP flag of C++ compiler" >&5
 $as_echo_n "checking for OpenMP flag of C++ compiler... " >&6; }
-if test "${ax_cv_cxx_openmp+set}" = set; then :
+if ${ax_cv_cxx_openmp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   saveCXXFLAGS=$CXXFLAGS
@@ -8179,7 +8204,7 @@
 if test "x$openmp_ok" = "xyes"; then
 		CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
 	ac_fn_cxx_check_header_mongrel "$LINENO" "omp.h" "ac_cv_header_omp_h" "$ac_includes_default"
-if test "x$ac_cv_header_omp_h" = x""yes; then :
+if test "x$ac_cv_header_omp_h" = xyes; then :
 
 fi
 
@@ -8191,7 +8216,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
 $as_echo_n "checking for png_read_info in -lpng... " >&6; }
-if test "${ac_cv_lib_png_png_read_info+set}" = set; then :
+if ${ac_cv_lib_png_png_read_info+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8225,9 +8250,9 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_read_info" >&5
 $as_echo "$ac_cv_lib_png_png_read_info" >&6; }
-if test "x$ac_cv_lib_png_png_read_info" = x""yes; then :
+if test "x$ac_cv_lib_png_png_read_info" = xyes; then :
   ac_fn_cxx_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
+if test "x$ac_cv_header_png_h" = xyes; then :
   png_ok=yes
 else
   png_ok=yes
@@ -8244,7 +8269,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8278,16 +8303,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
   ac_fn_cxx_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8321,12 +8346,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8360,12 +8385,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8399,7 +8424,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 fi
 
@@ -8433,7 +8458,7 @@
 		    gc_libs=""
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_init in -lgc" >&5
 $as_echo_n "checking for GC_init in -lgc... " >&6; }
-if test "${ac_cv_lib_gc_GC_init+set}" = set; then :
+if ${ac_cv_lib_gc_GC_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8467,7 +8492,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_init" >&5
 $as_echo "$ac_cv_lib_gc_GC_init" >&6; }
-if test "x$ac_cv_lib_gc_GC_init" = x""yes; then :
+if test "x$ac_cv_lib_gc_GC_init" = xyes; then :
   gc_ok=yes;
 				  LIBS="-lgc $gc_libs $LIBS";
 				  break
@@ -8478,7 +8503,7 @@
 		    gc_libs="-lpthread"
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_malloc in -lgc" >&5
 $as_echo_n "checking for GC_malloc in -lgc... " >&6; }
-if test "${ac_cv_lib_gc_GC_malloc+set}" = set; then :
+if ${ac_cv_lib_gc_GC_malloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8512,7 +8537,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_malloc" >&5
 $as_echo "$ac_cv_lib_gc_GC_malloc" >&6; }
-if test "x$ac_cv_lib_gc_GC_malloc" = x""yes; then :
+if test "x$ac_cv_lib_gc_GC_malloc" = xyes; then :
   gc_ok=yes;
 				  LIBS="-lgc $gc_libs $LIBS";
                                   break
@@ -8523,7 +8548,7 @@
 		    gc_libs="$lt_cv_dlopen_libs"
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_realloc in -lgc" >&5
 $as_echo_n "checking for GC_realloc in -lgc... " >&6; }
-if test "${ac_cv_lib_gc_GC_realloc+set}" = set; then :
+if ${ac_cv_lib_gc_GC_realloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8557,7 +8582,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_realloc" >&5
 $as_echo "$ac_cv_lib_gc_GC_realloc" >&6; }
-if test "x$ac_cv_lib_gc_GC_realloc" = x""yes; then :
+if test "x$ac_cv_lib_gc_GC_realloc" = xyes; then :
   gc_ok=yes;
 				  LIBS="-lgc $gc_libs $LIBS";
                                   break
@@ -8568,7 +8593,7 @@
 		    gc_libs="-lpthread $lt_cv_dlopen_libs"
 		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GC_free in -lgc" >&5
 $as_echo_n "checking for GC_free in -lgc... " >&6; }
-if test "${ac_cv_lib_gc_GC_free+set}" = set; then :
+if ${ac_cv_lib_gc_GC_free+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -8602,7 +8627,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gc_GC_free" >&5
 $as_echo "$ac_cv_lib_gc_GC_free" >&6; }
-if test "x$ac_cv_lib_gc_GC_free" = x""yes; then :
+if test "x$ac_cv_lib_gc_GC_free" = xyes; then :
   gc_ok=yes;
 				  LIBS="-lgc $gc_libs $LIBS";
 				  break
@@ -8624,7 +8649,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8663,7 +8688,7 @@
 for ac_header in sys/filio.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_filio_h" = x""yes; then :
+if test "x$ac_cv_header_sys_filio_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_FILIO_H 1
 _ACEOF
@@ -8677,7 +8702,7 @@
 for ac_header in malloc.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_h" = x""yes; then :
+if test "x$ac_cv_header_malloc_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MALLOC_H 1
 _ACEOF
@@ -8689,14 +8714,14 @@
 for ac_func in mallinfo
 do :
   ac_fn_cxx_check_func "$LINENO" "mallinfo" "ac_cv_func_mallinfo"
-if test "x$ac_cv_func_mallinfo" = x""yes; then :
+if test "x$ac_cv_func_mallinfo" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MALLINFO 1
 _ACEOF
 
 	ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "usmblks" "ac_cv_member_struct_mallinfo_usmblks" "#include <malloc.h>
 "
-if test "x$ac_cv_member_struct_mallinfo_usmblks" = x""yes; then :
+if test "x$ac_cv_member_struct_mallinfo_usmblks" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_MALLINFO_USMBLKS 1
@@ -8706,7 +8731,7 @@
 fi
 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fsmblks" "ac_cv_member_struct_mallinfo_fsmblks" "#include <malloc.h>
 "
-if test "x$ac_cv_member_struct_mallinfo_fsmblks" = x""yes; then :
+if test "x$ac_cv_member_struct_mallinfo_fsmblks" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_MALLINFO_FSMBLKS 1
@@ -8716,7 +8741,7 @@
 fi
 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "uordblks" "ac_cv_member_struct_mallinfo_uordblks" "#include <malloc.h>
 "
-if test "x$ac_cv_member_struct_mallinfo_uordblks" = x""yes; then :
+if test "x$ac_cv_member_struct_mallinfo_uordblks" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_MALLINFO_UORDBLKS 1
@@ -8726,7 +8751,7 @@
 fi
 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "fordblks" "ac_cv_member_struct_mallinfo_fordblks" "#include <malloc.h>
 "
-if test "x$ac_cv_member_struct_mallinfo_fordblks" = x""yes; then :
+if test "x$ac_cv_member_struct_mallinfo_fordblks" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_MALLINFO_FORDBLKS 1
@@ -8736,7 +8761,7 @@
 fi
 ac_fn_cxx_check_member "$LINENO" "struct mallinfo" "hblkhd" "ac_cv_member_struct_mallinfo_hblkhd" "#include <malloc.h>
 "
-if test "x$ac_cv_member_struct_mallinfo_hblkhd" = x""yes; then :
+if test "x$ac_cv_member_struct_mallinfo_hblkhd" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_MALLINFO_HBLKHD 1
@@ -8754,7 +8779,7 @@
 set dummy freetype-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_FREETYPE_CONFIG+set}" = set; then :
+if ${ac_cv_path_FREETYPE_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $FREETYPE_CONFIG in
@@ -8822,6 +8847,24 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX platform" >&5
+$as_echo_n "checking for OSX platform... " >&6; }
+if test "x$build_vendor" = "xapple" ; then
+  platform_osx=yes
+else
+  platform_osx=no
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $platform_osx" >&5
+$as_echo "$platform_osx" >&6; }
+ if test "$platform_osx" = "yes"; then
+  PLATFORM_OSX_TRUE=
+  PLATFORM_OSX_FALSE='#'
+else
+  PLATFORM_OSX_TRUE='#'
+  PLATFORM_OSX_FALSE=
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris platform" >&5
 $as_echo_n "checking for Solaris platform... " >&6; }
 case "$host" in
@@ -8863,13 +8906,14 @@
 
 
 
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -8912,7 +8956,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -8991,6 +9035,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "fontconfig" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9007,6 +9052,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "fontconfig" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9026,9 +9072,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "fontconfig" 2>&1`
+	        XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fontconfig" 2>&1`
         else
-	        XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors "fontconfig" 2>&1`
+	        XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fontconfig" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XFT_PKG_ERRORS" >&5
@@ -9061,6 +9107,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9077,6 +9124,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XFT_LIBS=`$PKG_CONFIG --libs "xft" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9096,9 +9144,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xft" 2>&1`
+	        XFT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xft" 2>&1`
         else
-	        XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors "xft" 2>&1`
+	        XFT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xft" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XFT_PKG_ERRORS" >&5
@@ -9117,7 +9165,7 @@
 fi
 		if test "x$xft_ok" != "xyes"; then
 						ac_fn_cxx_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then :
+if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
   xft_ok=yes
 else
   xft_ok=no
@@ -9171,6 +9219,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9187,6 +9236,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9206,9 +9256,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pangoft2" 2>&1`
+	        PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "pangoft2" 2>&1`
         else
-	        PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors "pangoft2" 2>&1`
+	        PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "pangoft2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PANGOFT2_PKG_ERRORS" >&5
@@ -9259,6 +9309,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GNOME_VFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9275,6 +9326,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GNOME_VFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9294,9 +9346,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-vfs-2.0 >= 2.0" 2>&1`
+	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gnome-vfs-2.0 >= 2.0" 2>&1`
         else
-	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-vfs-2.0 >= 2.0" 2>&1`
+	        GNOME_VFS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gnome-vfs-2.0 >= 2.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_VFS_PKG_ERRORS" >&5
@@ -9357,7 +9409,7 @@
 
 	 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if test "${ac_cv_c_bigendian+set}" = set; then :
+if ${ac_cv_c_bigendian+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_bigendian=unknown
@@ -9576,13 +9628,13 @@
      ;; #(
    *)
      as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
  esac
 
 	for ac_header in zlib.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+if test "x$ac_cv_header_zlib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB_H 1
 _ACEOF
@@ -9646,7 +9698,7 @@
     CFLAGS="$CFLAGS $checkPERL_CFLAGS"
     LIBS="$LIBS $checkPERL_LIBS"
     ac_fn_cxx_check_func "$LINENO" "perl_parse" "ac_cv_func_perl_parse"
-if test "x$ac_cv_func_perl_parse" = x""yes; then :
+if test "x$ac_cv_func_perl_parse" = xyes; then :
 
 	PERL_CFLAGS="$checkPERL_CFLAGS"
 	PERL_LIBS="$checkPERL_LIBS"
@@ -9708,7 +9760,7 @@
     CFLAGS="$CFLAGS $checkPYTHON_CFLAGS"
     LIBS="$LIBS $checkPYTHON_LIBS"
     ac_fn_cxx_check_func "$LINENO" "Py_Initialize" "ac_cv_func_Py_Initialize"
-if test "x$ac_cv_func_Py_Initialize" = x""yes; then :
+if test "x$ac_cv_func_Py_Initialize" = xyes; then :
 
 	PYTHON_CFLAGS="$checkPYTHON_CFLAGS"
 	PYTHON_LIBS="$checkPYTHON_LIBS"
@@ -9763,6 +9815,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LCMS_CFLAGS=`$PKG_CONFIG --cflags "lcms >= 1.13" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9779,6 +9832,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LCMS_LIBS=`$PKG_CONFIG --libs "lcms >= 1.13" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9798,9 +9852,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "lcms >= 1.13" 2>&1`
+	        LCMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms >= 1.13" 2>&1`
         else
-	        LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "lcms >= 1.13" 2>&1`
+	        LCMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms >= 1.13" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LCMS_PKG_ERRORS" >&5
@@ -9861,6 +9915,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.5.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9877,6 +9932,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.5.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9896,9 +9952,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler >= 0.5.9" 2>&1`
+	        POPPLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.5.9" 2>&1`
         else
-	        POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler >= 0.5.9" 2>&1`
+	        POPPLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.5.9" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POPPLER_PKG_ERRORS" >&5
@@ -9932,6 +9988,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_GLIB_CFLAGS=`$PKG_CONFIG --cflags "poppler-glib >= 0.5.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9948,6 +10005,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_GLIB_LIBS=`$PKG_CONFIG --libs "poppler-glib >= 0.5.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -9967,9 +10025,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-glib >= 0.5.9" 2>&1`
+	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-glib >= 0.5.9" 2>&1`
         else
-	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-glib >= 0.5.9" 2>&1`
+	        POPPLER_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-glib >= 0.5.9" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POPPLER_GLIB_PKG_ERRORS" >&5
@@ -10002,6 +10060,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAIRO_SVG_CFLAGS=`$PKG_CONFIG --cflags "cairo-svg" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10018,6 +10077,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAIRO_SVG_LIBS=`$PKG_CONFIG --libs "cairo-svg" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10037,9 +10097,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-svg" 2>&1`
+	        CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo-svg" 2>&1`
         else
-	        CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-svg" 2>&1`
+	        CAIRO_SVG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo-svg" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CAIRO_SVG_PKG_ERRORS" >&5
@@ -10076,6 +10136,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_CAIRO_CFLAGS=`$PKG_CONFIG --cflags "poppler-cairo >= 0.5.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10092,6 +10153,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_CAIRO_LIBS=`$PKG_CONFIG --libs "poppler-cairo >= 0.5.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10111,9 +10173,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler-cairo >= 0.5.9" 2>&1`
+	        POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler-cairo >= 0.5.9" 2>&1`
         else
-	        POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler-cairo >= 0.5.9" 2>&1`
+	        POPPLER_CAIRO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler-cairo >= 0.5.9" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POPPLER_CAIRO_PKG_ERRORS" >&5
@@ -10172,6 +10234,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_GFXFONT_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10188,6 +10251,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_POPPLER_GFXFONT_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10207,9 +10271,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "poppler >= 0.8.3" 2>&1`
+	        POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "poppler >= 0.8.3" 2>&1`
         else
-	        POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors "poppler >= 0.8.3" 2>&1`
+	        POPPLER_GFXFONT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "poppler >= 0.8.3" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$POPPLER_GFXFONT_PKG_ERRORS" >&5
@@ -10316,75 +10380,188 @@
 
 
 
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG" >&5
-$as_echo_n "checking for LIBWPG... " >&6; }
-
-if test -n "$LIBWPG_CFLAGS"; then
-    pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$LIBWPG_LIBS"; then
-    pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
-        else
-	        LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBWPG_PKG_ERRORS" >&5
-
-	with_libwpg=no
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	with_libwpg=no
-else
-	LIBWPG_CFLAGS=$pkg_cv_LIBWPG_CFLAGS
-	LIBWPG_LIBS=$pkg_cv_LIBWPG_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	with_libwpg=yes
-fi
+with_libwpg=no
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG01" >&5
+$as_echo_n "checking for LIBWPG01... " >&6; }
+
+if test -n "$LIBWPG01_CFLAGS"; then
+    pkg_cv_LIBWPG01_CFLAGS="$LIBWPG01_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBWPG01_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBWPG01_LIBS"; then
+    pkg_cv_LIBWPG01_LIBS="$LIBWPG01_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBWPG01_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBWPG01_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpg-0.1 libwpg-stream-0.1" 2>&1`
+        else
+	        LIBWPG01_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpg-0.1 libwpg-stream-0.1" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBWPG01_PKG_ERRORS" >&5
+
+	with_libwpg01=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	with_libwpg01=no
+else
+	LIBWPG01_CFLAGS=$pkg_cv_LIBWPG01_CFLAGS
+	LIBWPG01_LIBS=$pkg_cv_LIBWPG01_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	with_libwpg01=yes
+fi
+if test "x$with_libwpg01" = "xyes"; then
+
+$as_echo "#define WITH_LIBWPG01 1" >>confdefs.h
+
+	with_libwpg=yes
+	LIBWPG_LIBS=$LIBWPG01_LIBS
+
+	LIBWPG_CFLAGS=$LIBWPG01_CFLAGS
+
+fi
+ if test "x$with_libwpg01" = "xyes"; then
+  WITH_LIBWPG01_TRUE=
+  WITH_LIBWPG01_FALSE='#'
+else
+  WITH_LIBWPG01_TRUE='#'
+  WITH_LIBWPG01_FALSE=
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBWPG02" >&5
+$as_echo_n "checking for LIBWPG02... " >&6; }
+
+if test -n "$LIBWPG02_CFLAGS"; then
+    pkg_cv_LIBWPG02_CFLAGS="$LIBWPG02_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBWPG02_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBWPG02_LIBS"; then
+    pkg_cv_LIBWPG02_LIBS="$LIBWPG02_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBWPG02_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBWPG02_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
+        else
+	        LIBWPG02_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBWPG02_PKG_ERRORS" >&5
+
+	with_libwpg02=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	with_libwpg02=no
+else
+	LIBWPG02_CFLAGS=$pkg_cv_LIBWPG02_CFLAGS
+	LIBWPG02_LIBS=$pkg_cv_LIBWPG02_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	with_libwpg02=yes
+fi
+if test "x$with_libwpg02" = "xyes"; then
+
+$as_echo "#define WITH_LIBWPG02 1" >>confdefs.h
+
+	with_libwpg=yes
+	LIBWPG_LIBS=$LIBWPG02_LIBS
+
+	LIBWPG_CFLAGS=$LIBWPG02_CFLAGS
+
+fi
+ if test "x$with_libwpg02" = "xyes"; then
+  WITH_LIBWPG02_TRUE=
+  WITH_LIBWPG02_FALSE='#'
+else
+  WITH_LIBWPG02_TRUE='#'
+  WITH_LIBWPG02_FALSE=
+fi
+
+
 if test "x$with_libwpg" = "xyes"; then
 
 $as_echo "#define WITH_LIBWPG 1" >>confdefs.h
@@ -10401,9 +10578,6 @@
 
 
 
-
-
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMAGEMAGICK" >&5
 $as_echo_n "checking for IMAGEMAGICK... " >&6; }
@@ -10418,6 +10592,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_IMAGEMAGICK_CFLAGS=`$PKG_CONFIG --cflags "ImageMagick++" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10434,6 +10609,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_IMAGEMAGICK_LIBS=`$PKG_CONFIG --libs "ImageMagick++" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10453,9 +10629,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "ImageMagick++" 2>&1`
+	        IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ImageMagick++" 2>&1`
         else
-	        IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors "ImageMagick++" 2>&1`
+	        IMAGEMAGICK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ImageMagick++" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$IMAGEMAGICK_PKG_ERRORS" >&5
@@ -10505,6 +10681,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAIRO_USER_FONTS_CFLAGS=`$PKG_CONFIG --cflags "cairo > 1.7.6" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10521,6 +10698,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAIRO_USER_FONTS_LIBS=`$PKG_CONFIG --libs "cairo > 1.7.6" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10540,9 +10718,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo > 1.7.6" 2>&1`
+	        CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo > 1.7.6" 2>&1`
         else
-	        CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo > 1.7.6" 2>&1`
+	        CAIRO_USER_FONTS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo > 1.7.6" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CAIRO_USER_FONTS_PKG_ERRORS" >&5
@@ -10586,6 +10764,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_INKSCAPE_CFLAGS=`$PKG_CONFIG --cflags "gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10602,6 +10781,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_INKSCAPE_LIBS=`$PKG_CONFIG --libs "gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10621,9 +10801,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
+	        INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
         else
-	        INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
+	        INKSCAPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdkmm-2.4  glibmm-2.4 giomm-2.4 gtkmm-2.4 >= 2.10.0  gtk+-2.0  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo  sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$INKSCAPE_PKG_ERRORS" >&5
@@ -10652,7 +10832,7 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	INKSCAPE_CFLAGS=$pkg_cv_INKSCAPE_CFLAGS
 	INKSCAPE_LIBS=$pkg_cv_INKSCAPE_LIBS
@@ -10698,7 +10878,7 @@
 for ac_header in boost/concept_check.hpp
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "boost/concept_check.hpp" "ac_cv_header_boost_concept_check_hpp" "$ac_includes_default"
-if test "x$ac_cv_header_boost_concept_check_hpp" = x""yes; then :
+if test "x$ac_cv_header_boost_concept_check_hpp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BOOST_CONCEPT_CHECK_HPP 1
 _ACEOF
@@ -10725,6 +10905,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAIRO_PDF_CFLAGS=`$PKG_CONFIG --cflags "cairo-pdf" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10741,6 +10922,7 @@
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAIRO_PDF_LIBS=`$PKG_CONFIG --libs "cairo-pdf" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
@@ -10760,9 +10942,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo-pdf" 2>&1`
+	        CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "cairo-pdf" 2>&1`
         else
-	        CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo-pdf" 2>&1`
+	        CAIRO_PDF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "cairo-pdf" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CAIRO_PDF_PKG_ERRORS" >&5
@@ -10791,7 +10973,7 @@
 fi
 
 ac_fn_cxx_check_header_mongrel "$LINENO" "popt.h" "ac_cv_header_popt_h" "$ac_includes_default"
-if test "x$ac_cv_header_popt_h" = x""yes; then :
+if test "x$ac_cv_header_popt_h" = xyes; then :
   INKSCAPE_LIBS="$INKSCAPE_LIBS -lpopt"
 else
   as_fn_error $? "libpopt is required" "$LINENO" 5
@@ -10801,7 +10983,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
 $as_echo_n "checking for new_aspell_config in -laspell... " >&6; }
-if test "${ac_cv_lib_aspell_new_aspell_config+set}" = set; then :
+if ${ac_cv_lib_aspell_new_aspell_config+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10835,9 +11017,9 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
 $as_echo "$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test "x$ac_cv_lib_aspell_new_aspell_config" = x""yes; then :
+if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes; then :
   ac_fn_cxx_check_header_mongrel "$LINENO" "aspell.h" "ac_cv_header_aspell_h" "$ac_includes_default"
-if test "x$ac_cv_header_aspell_h" = x""yes; then :
+if test "x$ac_cv_header_aspell_h" = xyes; then :
   aspell_ok=yes
 else
   aspell_ok=no
@@ -10863,7 +11045,7 @@
 for ac_func in bind_textdomain_codeset
 do :
   ac_fn_cxx_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
@@ -10874,7 +11056,7 @@
 for ac_func in gtk_window_set_default_icon_from_file
 do :
   ac_fn_cxx_check_func "$LINENO" "gtk_window_set_default_icon_from_file" "ac_cv_func_gtk_window_set_default_icon_from_file"
-if test "x$ac_cv_func_gtk_window_set_default_icon_from_file" = x""yes; then :
+if test "x$ac_cv_func_gtk_window_set_default_icon_from_file" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE 1
 _ACEOF
@@ -10885,7 +11067,7 @@
 for ac_func in gtk_window_fullscreen
 do :
   ac_fn_cxx_check_func "$LINENO" "gtk_window_fullscreen" "ac_cv_func_gtk_window_fullscreen"
-if test "x$ac_cv_func_gtk_window_fullscreen" = x""yes; then :
+if test "x$ac_cv_func_gtk_window_fullscreen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GTK_WINDOW_FULLSCREEN 1
 _ACEOF
@@ -10987,7 +11169,7 @@
 for ac_func in pow
 do :
   ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
+if test "x$ac_cv_func_pow" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_POW 1
 _ACEOF
@@ -10999,7 +11181,7 @@
 if test x"$ac_cv_func_pow" = x"no" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
 $as_echo_n "checking for pow in -lm... " >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11033,7 +11215,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
 $as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -11046,7 +11228,7 @@
 for ac_func in sqrt
 do :
   ac_fn_cxx_check_func "$LINENO" "sqrt" "ac_cv_func_sqrt"
-if test "x$ac_cv_func_sqrt" = x""yes; then :
+if test "x$ac_cv_func_sqrt" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SQRT 1
 _ACEOF
@@ -11057,7 +11239,7 @@
 for ac_func in floor
 do :
   ac_fn_cxx_check_func "$LINENO" "floor" "ac_cv_func_floor"
-if test "x$ac_cv_func_floor" = x""yes; then :
+if test "x$ac_cv_func_floor" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FLOOR 1
 _ACEOF
@@ -11068,7 +11250,7 @@
 for ac_func in gettimeofday
 do :
   ac_fn_cxx_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = x""yes; then :
+if test "x$ac_cv_func_gettimeofday" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETTIMEOFDAY 1
 _ACEOF
@@ -11079,7 +11261,7 @@
 for ac_func in memmove
 do :
   ac_fn_cxx_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = x""yes; then :
+if test "x$ac_cv_func_memmove" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMMOVE 1
 _ACEOF
@@ -11090,7 +11272,7 @@
 for ac_func in memset
 do :
   ac_fn_cxx_check_func "$LINENO" "memset" "ac_cv_func_memset"
-if test "x$ac_cv_func_memset" = x""yes; then :
+if test "x$ac_cv_func_memset" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MEMSET 1
 _ACEOF
@@ -11101,7 +11283,7 @@
 for ac_func in mkdir
 do :
   ac_fn_cxx_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
-if test "x$ac_cv_func_mkdir" = x""yes; then :
+if test "x$ac_cv_func_mkdir" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MKDIR 1
 _ACEOF
@@ -11112,7 +11294,7 @@
 for ac_func in strncasecmp
 do :
   ac_fn_cxx_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp"
-if test "x$ac_cv_func_strncasecmp" = x""yes; then :
+if test "x$ac_cv_func_strncasecmp" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRNCASECMP 1
 _ACEOF
@@ -11123,7 +11305,7 @@
 for ac_func in strpbrk
 do :
   ac_fn_cxx_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk"
-if test "x$ac_cv_func_strpbrk" = x""yes; then :
+if test "x$ac_cv_func_strpbrk" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRPBRK 1
 _ACEOF
@@ -11134,7 +11316,7 @@
 for ac_func in strrchr
 do :
   ac_fn_cxx_check_func "$LINENO" "strrchr" "ac_cv_func_strrchr"
-if test "x$ac_cv_func_strrchr" = x""yes; then :
+if test "x$ac_cv_func_strrchr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRRCHR 1
 _ACEOF
@@ -11145,7 +11327,7 @@
 for ac_func in strspn
 do :
   ac_fn_cxx_check_func "$LINENO" "strspn" "ac_cv_func_strspn"
-if test "x$ac_cv_func_strspn" = x""yes; then :
+if test "x$ac_cv_func_strspn" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRSPN 1
 _ACEOF
@@ -11156,7 +11338,7 @@
 for ac_func in strstr
 do :
   ac_fn_cxx_check_func "$LINENO" "strstr" "ac_cv_func_strstr"
-if test "x$ac_cv_func_strstr" = x""yes; then :
+if test "x$ac_cv_func_strstr" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRSTR 1
 _ACEOF
@@ -11167,7 +11349,7 @@
 for ac_func in strtoul
 do :
   ac_fn_cxx_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul"
-if test "x$ac_cv_func_strtoul" = x""yes; then :
+if test "x$ac_cv_func_strtoul" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRTOUL 1
 _ACEOF
@@ -11178,7 +11360,7 @@
 for ac_func in fpsetmask
 do :
   ac_fn_cxx_check_func "$LINENO" "fpsetmask" "ac_cv_func_fpsetmask"
-if test "x$ac_cv_func_fpsetmask" = x""yes; then :
+if test "x$ac_cv_func_fpsetmask" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FPSETMASK 1
 _ACEOF
@@ -11189,7 +11371,7 @@
 for ac_func in ecvt
 do :
   ac_fn_cxx_check_func "$LINENO" "ecvt" "ac_cv_func_ecvt"
-if test "x$ac_cv_func_ecvt" = x""yes; then :
+if test "x$ac_cv_func_ecvt" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ECVT 1
 _ACEOF
@@ -11200,7 +11382,7 @@
 for ac_header in ieeefp.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "$ac_includes_default"
-if test "x$ac_cv_header_ieeefp_h" = x""yes; then :
+if test "x$ac_cv_header_ieeefp_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_IEEEFP_H 1
 _ACEOF
@@ -11212,7 +11394,7 @@
 for ac_header in fcntl.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
-if test "x$ac_cv_header_fcntl_h" = x""yes; then :
+if test "x$ac_cv_header_fcntl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FCNTL_H 1
 _ACEOF
@@ -11224,7 +11406,7 @@
 for ac_header in libintl.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
-if test "x$ac_cv_header_libintl_h" = x""yes; then :
+if test "x$ac_cv_header_libintl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL_H 1
 _ACEOF
@@ -11236,7 +11418,7 @@
 for ac_header in stddef.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "stddef.h" "ac_cv_header_stddef_h" "$ac_includes_default"
-if test "x$ac_cv_header_stddef_h" = x""yes; then :
+if test "x$ac_cv_header_stddef_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDDEF_H 1
 _ACEOF
@@ -11248,7 +11430,7 @@
 for ac_header in sys/time.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_time_h" = x""yes; then :
+if test "x$ac_cv_header_sys_time_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_TIME_H 1
 _ACEOF
@@ -11259,7 +11441,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f conftest.sym conftest.file
@@ -11321,7 +11503,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
 $as_echo_n "checking whether stat accepts an empty string... " >&6; }
-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
+if ${ac_cv_func_stat_empty_string_bug+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -11368,7 +11550,7 @@
 for ac_func in strftime
 do :
   ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = x""yes; then :
+if test "x$ac_cv_func_strftime" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRFTIME 1
 _ACEOF
@@ -11377,7 +11559,7 @@
   # strftime is in -lintl on SCO UNIX.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
 $as_echo_n "checking for strftime in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_strftime+set}" = set; then :
+if ${ac_cv_lib_intl_strftime+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11411,7 +11593,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
 $as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
   $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
 
 LIBS="-lintl $LIBS"
@@ -11422,7 +11604,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
 $as_echo_n "checking for working strtod... " >&6; }
-if test "${ac_cv_func_strtod+set}" = set; then :
+if ${ac_cv_func_strtod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -11481,14 +11663,14 @@
 esac
 
 ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
+if test "x$ac_cv_func_pow" = xyes; then :
 
 fi
 
 if test $ac_cv_func_pow = no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
 $as_echo_n "checking for pow in -lm... " >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11522,7 +11704,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
 $as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   POW_LIB=-lm
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
@@ -11535,7 +11717,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if test "${ac_cv_header_stat_broken+set}" = set; then :
+if ${ac_cv_header_stat_broken+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11577,7 +11759,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11612,7 +11794,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11646,7 +11828,7 @@
 fi
 
 ac_fn_cxx_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
 else
 
@@ -11658,7 +11840,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11840,10 +12022,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -11918,6 +12111,10 @@
   as_fn_error $? "conditional \"PLATFORM_WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${PLATFORM_OSX_TRUE}" && test -z "${PLATFORM_OSX_FALSE}"; then
+  as_fn_error $? "conditional \"PLATFORM_OSX\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${PLATFORM_SOLARIS_TRUE}" && test -z "${PLATFORM_SOLARIS_FALSE}"; then
   as_fn_error $? "conditional \"PLATFORM_SOLARIS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11943,6 +12140,14 @@
   as_fn_error $? "conditional \"WITH_PYTHON\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WITH_LIBWPG01_TRUE}" && test -z "${WITH_LIBWPG01_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBWPG01\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${WITH_LIBWPG02_TRUE}" && test -z "${WITH_LIBWPG02_FALSE}"; then
+  as_fn_error $? "conditional \"WITH_LIBWPG02\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${WITH_LIBWPG_TRUE}" && test -z "${WITH_LIBWPG_FALSE}"; then
   as_fn_error $? "conditional \"WITH_LIBWPG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -11956,7 +12161,7 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -12057,6 +12262,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -12363,8 +12569,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by inkscape $as_me 0.48.1, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+This file was extended by inkscape $as_me 0.48.2, which was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -12429,8 +12635,8 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-inkscape config.status 0.48.1
-configured by $0, generated by GNU Autoconf 2.67,
+inkscape config.status 0.48.2
+configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -12635,7 +12841,7 @@
     "inkview.1") CONFIG_FILES="$CONFIG_FILES inkview.1" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -12658,9 +12864,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -12668,12 +12875,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -12695,7 +12903,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -12723,7 +12931,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -12771,7 +12979,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -12803,7 +13011,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -12837,7 +13045,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -12849,8 +13057,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -12951,7 +13159,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -12970,7 +13178,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -12979,7 +13187,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -13005,8 +13213,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -13142,21 +13350,22 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -13167,20 +13376,20 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.

=== modified file 'configure.ac'
--- configure.ac	2011-02-20 12:07:30 +0000
+++ configure.ac	2011-07-10 11:35:55 +0000
@@ -7,7 +7,7 @@
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.48.1)
+AC_INIT(inkscape, 0.48.2)
 
 AC_CANONICAL_HOST
 AC_CONFIG_SRCDIR([src/main.cpp])
@@ -313,6 +313,18 @@
 AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
 AC_SUBST(WIN32_CFLAGS)
 
+dnl ******************************
+dnl MacOS X
+dnl ******************************
+AC_MSG_CHECKING([for OSX platform])
+if test "x$build_vendor" = "xapple" ; then
+  platform_osx=yes
+else
+  platform_osx=no
+fi
+AC_MSG_RESULT([$platform_osx])
+AM_CONDITIONAL(PLATFORM_OSX, test "$platform_osx" = "yes")
+	
 AC_MSG_CHECKING([for Solaris platform])
 case "$host" in
   *-solaris2.*)
@@ -699,15 +711,31 @@
 dnl Check for libwpg for extension
 dnl ******************************
 
-PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
+with_libwpg=no
+
+PKG_CHECK_MODULES(LIBWPG01, libwpg-0.1 libwpg-stream-0.1, with_libwpg01=yes, with_libwpg01=no)
+if test "x$with_libwpg01" = "xyes"; then
+	AC_DEFINE(WITH_LIBWPG01,1,[Build in libwpg 0.1.x])
+	with_libwpg=yes
+	AC_SUBST(LIBWPG_LIBS, $LIBWPG01_LIBS)
+	AC_SUBST(LIBWPG_CFLAGS, $LIBWPG01_CFLAGS)
+fi
+AM_CONDITIONAL(WITH_LIBWPG01, test "x$with_libwpg01" = "xyes")
+
+PKG_CHECK_MODULES(LIBWPG02, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg02=yes, with_libwpg02=no)
+if test "x$with_libwpg02" = "xyes"; then
+	AC_DEFINE(WITH_LIBWPG02,1,[Build in libwpg 0.2.x])
+	with_libwpg=yes
+	AC_SUBST(LIBWPG_LIBS, $LIBWPG02_LIBS)
+	AC_SUBST(LIBWPG_CFLAGS, $LIBWPG02_CFLAGS)
+fi
+AM_CONDITIONAL(WITH_LIBWPG02, test "x$with_libwpg02" = "xyes")
+
 if test "x$with_libwpg" = "xyes"; then
 	AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
 fi
 AM_CONDITIONAL(WITH_LIBWPG, test "x$with_libwpg" = "xyes")
 
-AC_SUBST(LIBWPG_LIBS)
-AC_SUBST(LIBWPG_CFLAGS)
-
 dnl ******************************
 dnl Check for ImageMagick Magick++ 
 dnl ******************************

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-06 16:50:22 +0000
+++ debian/changelog	2011-07-10 11:35:55 +0000
@@ -1,3 +1,25 @@
+inkscape (0.48.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release (LP: #807912).  Fixes several Ubuntu bugs:
+    - [SVG Font Editor] Crash when kerning an empty pair (LP: #706506)
+    - Connector tool crash Inkscake (orthogonal mode) (LP: #771738)
+    - Errors printed to console if openclipart search fails (LP: #638844)
+    - pdf export with cairo 1.10 defaults to version PDF-1.5 (LP: #664335)
+    - Cairo rendering broken for "use" elements when scaling or a viewBox 
+      (LP: #705345)
+    - gimp_xcf.py crashed with TypeError in effect() (LP: #565296)
+    - Enable build against libwpg-0.2 (LP: #778951)
+    - Please add supported filetypes into MimeType line of inkscape.desktop 
+      (LP: #278307)
+    - Inkscape fails to build with gcc 4.6 (LP: #707205)
+  * Drop 01-libwpg0.2.dpatch - Applied upstream
+  * Drop 03-add-missing-mimetypes.dpatch - Applied upstream
+  * Drop 04-fix-build-with-gcc4.6.dpatch - Applied upstream
+  * Drop 05-add-missing-includes.dpatch - Applied upstream
+  * Drop fix-fontforge-glyph-template.dpatch - Applied upstream
+
+ -- Alex Valavanis <[e-mail]>  Sun, 10 Jul 2011 11:35:30 +0100
+
 inkscape (0.48.1-2.1ubuntu1) oneiric; urgency=low
 
   * Merge from Debian Unstable (LP: #791728).  Remaining changes:

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2011-06-02 17:17:33 +0000
+++ debian/patches/00list	2011-07-10 11:35:55 +0000
@@ -1,8 +1,3 @@
-01-libwpg0.2.dpatch
 02-add-shebangs-and-fix-permissions
-03-add-missing-mimetypes
 01_add_unity_quicklist_support.patch
-04-fix-build-with-gcc4.6.dpatch
-05-add-missing-includes.dpatch
-fix-fontforge-glyph-template.dpatch
 fix-datamatrix-ui.dpatch

=== removed file 'debian/patches/01-libwpg0.2.dpatch'
--- debian/patches/01-libwpg0.2.dpatch	2011-06-01 18:05:51 +0000
+++ debian/patches/01-libwpg0.2.dpatch	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_libwpd0_9.dpatch by  <[e-mail]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-
---- a/configure
-+++ b/configure
-@@ -10325,12 +10325,13 @@ if test -n "$LIBWPG_CFLAGS"; then
-     pkg_cv_LIBWPG_CFLAGS="$LIBWPG_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
-+
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
-+  pkg_cv_LIBWPG_CFLAGS=`$PKG_CONFIG --cflags "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -10341,12 +10342,13 @@ if test -n "$LIBWPG_LIBS"; then
-     pkg_cv_LIBWPG_LIBS="$LIBWPG_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.1 libwpg-stream-0.1\""; } >&5
--  ($PKG_CONFIG --exists --print-errors "libwpg-0.1 libwpg-stream-0.1") 2>&5
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwpg-0.2 libwpd-0.9 libwpd-stream-0.9\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9") 2>&5
-+
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
--  pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.1 libwpg-stream-0.1" 2>/dev/null`
-+  pkg_cv_LIBWPG_LIBS=`$PKG_CONFIG --libs "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -10366,9 +10368,9 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
-+                LIBWPG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
-         else
--	        LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.1 libwpg-stream-0.1" 2>&1`
-+	        LIBWPG_PKG_ERRORS=`$PKG_CONFIG --print-errors "libwpg-0.2 libwpd-0.9 libwpd-stream-0.9" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBWPG_PKG_ERRORS" >&5
---- a/configure.ac
-+++ b/configure.ac
-@@ -699,7 +699,7 @@ dnl ******************************
- dnl Check for libwpg for extension
- dnl ******************************
- 
--PKG_CHECK_MODULES(LIBWPG, libwpg-0.1 libwpg-stream-0.1, with_libwpg=yes, with_libwpg=no)
-+PKG_CHECK_MODULES(LIBWPG, libwpg-0.2 libwpd-0.9 libwpd-stream-0.9, with_libwpg=yes, with_libwpg=no)
- if test "x$with_libwpg" = "xyes"; then
- 	AC_DEFINE(WITH_LIBWPG,1,[Build in libwpg])
- fi
---- inkscape-0.48.0~/src/extension/internal/wpg-input.cpp       2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.0/src/extension/internal/wpg-input.cpp        2010-11-24 15:57:38.000000000 +0100
-@@ -49,7 +49,7 @@
- #include "document.h"
-
- #include "libwpg/libwpg.h"
--#include "libwpg/WPGStreamImplementation.h"
-+#include "libwpd-stream/libwpd-stream.h"
-
-
- using namespace libwpg;
-@@ -61,9 +61,9 @@
-
- SPDocument *
- WpgInput::open(Inkscape::Extension::Input * mod, const gchar * uri) {
--    WPXInputStream* input = new libwpg::WPGFileStream(uri);
-+    WPXInputStream* input = new WPXFileStream(uri);
-     if (input->isOLEStream()) {
--        WPXInputStream* olestream = input->getDocumentOLEStream();
-+        WPXInputStream* olestream = input->getDocumentOLEStream("PerfectOffice_MAIN");
-         if (olestream) {
-             delete input;
-             input = olestream;
-@@ -78,7 +78,7 @@
-         return NULL;
-     }
-
--    libwpg::WPGString output;
-+    WPXString output;
-     if (!libwpg::WPGraphics::generateSVG(input, output)) {
-         delete input;
-         return NULL;

=== removed file 'debian/patches/03-add-missing-mimetypes.dpatch'
--- debian/patches/03-add-missing-mimetypes.dpatch	2011-06-01 18:05:51 +0000
+++ debian/patches/03-add-missing-mimetypes.dpatch	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-add-missing-mimetypes.dpatch by  <[e-mail]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to Add supported Mime types to inkscape.desktop.in
-## DP: Taken from upstream's Bug tracker at
-## DP: https://bugs.launchpad.net/ubuntu/+source/inkscape/+bug/278307
-## DP: original patch by Mantas Kriaučiūnas
-
-@DPATCH@
-
---- a/inkscape.desktop.in	2008-03-11 04:21:19.000000000 +0000
-+++ b/inkscape.desktop.in	2008-10-04 20:36:49.311456804 +0000
-@@ -7,5 +7,5 @@
- Type=Application
- Categories=Graphics;VectorGraphics;GTK;
--MimeType=image/svg+xml;image/svg+xml-compressed;
-+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator;
- Exec=inkscape %F
- TryExec=inkscape

=== removed file 'debian/patches/04-fix-build-with-gcc4.6.dpatch'
--- debian/patches/04-fix-build-with-gcc4.6.dpatch	2011-05-30 17:07:11 +0000
+++ debian/patches/04-fix-build-with-gcc4.6.dpatch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04-fix-build-with-gcc4.6.dpatch by Mehdi Dogguy <[e-mail]>
-##
-## DP: #624770
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/Makefile.am inkscape-0.48.1/src/Makefile.am
---- inkscape-0.48.1~/src/Makefile.am	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/Makefile.am	2011-05-30 16:36:29.000000000 +0200
-@@ -205,7 +205,7 @@
- 
- inkscape_SOURCES += main.cpp $(win32_sources)
- inkscape_LDADD = $(all_libs)
--inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows)
-+inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows)
- 
- inkview_SOURCES += inkview.cpp $(win32_sources)
- inkview_LDADD = $(all_libs)

=== removed file 'debian/patches/05-add-missing-includes.dpatch'
--- debian/patches/05-add-missing-includes.dpatch	2011-05-30 17:07:11 +0000
+++ debian/patches/05-add-missing-includes.dpatch	1970-01-01 00:00:00 +0000
@@ -1,799 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05-add-missing-includes.dpatch by Mehdi Dogguy <[e-mail]>
-##
-## DP: #628226.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/2geom/utils.h inkscape-0.48.1/src/2geom/utils.h
---- inkscape-0.48.1~/src/2geom/utils.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/2geom/utils.h	2011-05-30 17:48:28.000000000 +0200
-@@ -35,6 +35,7 @@
- 
- #include <cmath>
- #include <vector>
-+#include <stddef.h>
- 
- namespace Geom {
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/arc-context.h inkscape-0.48.1/src/arc-context.h
---- inkscape-0.48.1~/src/arc-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/arc-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #include <2geom/point.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/box3d-context.h inkscape-0.48.1/src/box3d-context.h
---- inkscape-0.48.1~/src/box3d-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/box3d-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  * Released under GNU GPL
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "proj_pt.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/conn-avoid-ref.h inkscape-0.48.1/src/conn-avoid-ref.h
---- inkscape-0.48.1~/src/conn-avoid-ref.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/conn-avoid-ref.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  */
- 
- #include <glib/gslist.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- struct SPDesktop;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/connection-pool.h inkscape-0.48.1/src/connection-pool.h
---- inkscape-0.48.1~/src/connection-pool.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/connection-pool.h	2011-05-30 17:47:12.000000000 +0200
-@@ -3,6 +3,7 @@
- 
- #include <glib-object.h>
- #include <gtkmm.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- namespace Inkscape
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/connector-context.h inkscape-0.48.1/src/connector-context.h
---- inkscape-0.48.1~/src/connector-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/connector-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -12,6 +12,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <sigc++/connection.h>
- #include "event-context.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/desktop.h inkscape-0.48.1/src/desktop.h
---- inkscape-0.48.1~/src/desktop.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/desktop.h	2011-05-30 17:47:12.000000000 +0200
-@@ -27,6 +27,7 @@
- 
- #include <gdk/gdkevents.h>
- #include <gtk/gtktypeutils.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- #include <2geom/matrix.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/display/canvas-temporary-item.h inkscape-0.48.1/src/display/canvas-temporary-item.h
---- inkscape-0.48.1~/src/display/canvas-temporary-item.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/display/canvas-temporary-item.h	2011-05-30 17:47:12.000000000 +0200
-@@ -12,6 +12,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include "display/display-forward.h"
- 
- #include <sigc++/sigc++.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document-private.h inkscape-0.48.1/src/document-private.h
---- inkscape-0.48.1~/src/document-private.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/document-private.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  */
- 
- #include <map>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "xml/event-fns.h"
- #include "sp-defs.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document-subset.h inkscape-0.48.1/src/document-subset.h
---- inkscape-0.48.1~/src/document-subset.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/document-subset.h	2011-05-30 17:47:12.000000000 +0200
-@@ -10,6 +10,7 @@
- #ifndef SEEN_INKSCAPE_DOCUMENT_SUBSET_H
- #define SEEN_INKSCAPE_DOCUMENT_SUBSET_H
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/slot.h>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/document.h inkscape-0.48.1/src/document.h
---- inkscape-0.48.1~/src/document.h	2010-08-04 18:45:00.000000000 +0200
-+++ inkscape-0.48.1/src/document.h	2011-05-30 17:47:12.000000000 +0200
-@@ -17,6 +17,7 @@
- 
- #include <glib-object.h>
- #include <gtk/gtksignal.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <sigc++/class_slot.h>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/draw-context.h inkscape-0.48.1/src/draw-context.h
---- inkscape-0.48.1~/src/draw-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/draw-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  * Released under GNU GPL
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include <forward.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/extension/timer.h inkscape-0.48.1/src/extension/timer.h
---- inkscape-0.48.1~/src/extension/timer.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/extension/timer.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
- #ifndef INKSCAPE_EXTENSION_TIMER_H__
- #define INKSCAPE_EXTENSION_TIMER_H__
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glibmm/timeval.h>
- #include "extension-forward.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/flood-context.h inkscape-0.48.1/src/flood-context.h
---- inkscape-0.48.1~/src/flood-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/flood-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
-  * Released under GNU GPL
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtk/gtk.h>
- #include "event-context.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gc-alloc.h inkscape-0.48.1/src/gc-alloc.h
---- inkscape-0.48.1~/src/gc-alloc.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/gc-alloc.h	2011-05-30 17:47:12.000000000 +0200
-@@ -16,6 +16,7 @@
- #define SEEN_INKSCAPE_GC_ALLOC_H
- 
- #include <limits>
-+#include <stddef.h>
- #include "gc-core.h"
- 
- namespace Inkscape {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gc.cpp inkscape-0.48.1/src/gc.cpp
---- inkscape-0.48.1~/src/gc.cpp	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/gc.cpp	2011-05-30 17:47:12.000000000 +0200
-@@ -16,6 +16,7 @@
- #include <glib/gmessages.h>
- #include <sigc++/functors/ptr_fun.h>
- #include <glibmm/main.h>
-+#include <stddef.h>
- 
- namespace Inkscape {
- namespace GC {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gradient-context.h inkscape-0.48.1/src/gradient-context.h
---- inkscape-0.48.1~/src/gradient-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/gradient-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  * Released under GNU GPL
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/gradient-drag.h inkscape-0.48.1/src/gradient-drag.h
---- inkscape-0.48.1~/src/gradient-drag.h	2010-08-04 18:45:00.000000000 +0200
-+++ inkscape-0.48.1/src/gradient-drag.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  */
- 
- #include <glib/gslist.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <vector>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/knot.h inkscape-0.48.1/src/knot.h
---- inkscape-0.48.1~/src/knot.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/knot.h	2011-05-30 17:47:12.000000000 +0200
-@@ -20,6 +20,7 @@
- #include "forward.h"
- #include <2geom/point.h>
- #include "knot-enums.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- class SPKnot;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/libavoid/geomtypes.h inkscape-0.48.1/src/libavoid/geomtypes.h
---- inkscape-0.48.1~/src/libavoid/geomtypes.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/libavoid/geomtypes.h	2011-05-30 17:47:12.000000000 +0200
-@@ -29,6 +29,7 @@
- #ifndef AVOID_GEOMTYPES_H
- #define AVOID_GEOMTYPES_H
- 
-+#include <stddef.h>
- #include <vector>
- #include <utility>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/lpeobject-reference.h inkscape-0.48.1/src/live_effects/lpeobject-reference.h
---- inkscape-0.48.1~/src/live_effects/lpeobject-reference.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/live_effects/lpeobject-reference.h	2011-05-30 17:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
- 
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- namespace Inkscape {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/parameter/path-reference.h inkscape-0.48.1/src/live_effects/parameter/path-reference.h
---- inkscape-0.48.1~/src/live_effects/parameter/path-reference.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/live_effects/parameter/path-reference.h	2011-05-30 17:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
- 
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- class Path;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/live_effects/parameter/path.h inkscape-0.48.1/src/live_effects/parameter/path.h
---- inkscape-0.48.1~/src/live_effects/parameter/path.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/live_effects/parameter/path.h	2011-05-30 17:47:12.000000000 +0200
-@@ -16,6 +16,7 @@
- 
- #include "live_effects/parameter/parameter.h"
- #include "live_effects/parameter/path-reference.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- namespace Inkscape {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/message-stack.h inkscape-0.48.1/src/message-stack.h
---- inkscape-0.48.1~/src/message-stack.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/message-stack.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- #ifndef SEEN_INKSCAPE_MESSAGE_STACK_H
- #define SEEN_INKSCAPE_MESSAGE_STACK_H
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glib.h>
- #include <stdarg.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/object-hierarchy.h inkscape-0.48.1/src/object-hierarchy.h
---- inkscape-0.48.1~/src/object-hierarchy.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/object-hierarchy.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- 
- #include <exception>
- #include <list>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/signal.h>
- #include <glib/gmessages.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/persp3d-reference.h inkscape-0.48.1/src/persp3d-reference.h
---- inkscape-0.48.1~/src/persp3d-reference.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/persp3d-reference.h	2011-05-30 17:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
-  */
- 
- #include "uri-references.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "persp3d.h"
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/rect-context.h inkscape-0.48.1/src/rect-context.h
---- inkscape-0.48.1~/src/rect-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/rect-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  * Released under GNU GPL
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "libnr/nr-point.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selcue.h inkscape-0.48.1/src/selcue.h
---- inkscape-0.48.1~/src/selcue.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/selcue.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  */
- 
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- class SPDesktop;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selection-describer.h inkscape-0.48.1/src/selection-describer.h
---- inkscape-0.48.1~/src/selection-describer.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/selection-describer.h	2011-05-30 17:47:12.000000000 +0200
-@@ -12,6 +12,7 @@
- #ifndef SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
- #define SEEN_INKSCAPE_SELECTION_DESCRIPTION_HANDLER_H
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "message-context.h"
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/selection.h inkscape-0.48.1/src/selection.h
---- inkscape-0.48.1~/src/selection.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/selection.h	2011-05-30 17:47:12.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <vector>
- #include <map>
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- //#include "libnr/nr-rect.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/seltrans.h inkscape-0.48.1/src/seltrans.h
---- inkscape-0.48.1~/src/seltrans.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/seltrans.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <2geom/point.h>
- #include <2geom/matrix.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-conn-end-pair.h inkscape-0.48.1/src/sp-conn-end-pair.h
---- inkscape-0.48.1~/src/sp-conn-end-pair.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-conn-end-pair.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
- 
- #include "forward.h"
- #include "libnr/nr-point.h"
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/slot.h>
- #include <sigc++/signal.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-conn-end.h inkscape-0.48.1/src/sp-conn-end.h
---- inkscape-0.48.1~/src/sp-conn-end.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-conn-end.h	2011-05-30 17:47:12.000000000 +0200
-@@ -2,6 +2,7 @@
- #define SEEN_SP_CONN_END
- 
- #include <glib/gtypes.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #include "sp-use-reference.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-gradient.h inkscape-0.48.1/src/sp-gradient.h
---- inkscape-0.48.1~/src/sp-gradient.h	2010-08-04 18:45:00.000000000 +0200
-+++ inkscape-0.48.1/src/sp-gradient.h	2011-05-30 17:47:12.000000000 +0200
-@@ -25,6 +25,7 @@
- #include "sp-gradient-units.h"
- #include "sp-gradient-vector.h"
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- struct SPGradientReference;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-object.h inkscape-0.48.1/src/sp-object.h
---- inkscape-0.48.1~/src/sp-object.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-object.h	2011-05-30 17:47:12.000000000 +0200
-@@ -56,6 +56,7 @@
- 
- 
- #include <glib-object.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/functors/slot.h>
- #include <sigc++/signal.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-offset.h inkscape-0.48.1/src/sp-offset.h
---- inkscape-0.48.1~/src/sp-offset.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-offset.h	2011-05-30 17:47:12.000000000 +0200
-@@ -16,6 +16,7 @@
- 
- #include "sp-shape.h"
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- #define SP_TYPE_OFFSET            (sp_offset_get_type ())
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-pattern.h inkscape-0.48.1/src/sp-pattern.h
---- inkscape-0.48.1~/src/sp-pattern.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-pattern.h	2011-05-30 17:47:12.000000000 +0200
-@@ -32,6 +32,7 @@
- #include "sp-paint-server.h"
- #include "uri-references.h"
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- class SPPatternReference : public Inkscape::URIReference {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-shape.h inkscape-0.48.1/src/sp-shape.h
---- inkscape-0.48.1~/src/sp-shape.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-shape.h	2011-05-30 17:47:12.000000000 +0200
-@@ -19,6 +19,7 @@
- #include "sp-marker-loc.h"
- #include <2geom/forward.h>
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #define SP_TYPE_SHAPE (sp_shape_get_type ())
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-switch.h inkscape-0.48.1/src/sp-switch.h
---- inkscape-0.48.1~/src/sp-switch.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-switch.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- 
- #include "sp-item-group.h"
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #define SP_TYPE_SWITCH            (CSwitch::getType())
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-text.h inkscape-0.48.1/src/sp-text.h
---- inkscape-0.48.1~/src/sp-text.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-text.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  */
- 
- #include <glib/gtypes.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "sp-item.h"
- #include "sp-string.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-tref-reference.h inkscape-0.48.1/src/sp-tref-reference.h
---- inkscape-0.48.1~/src/sp-tref-reference.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-tref-reference.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
- 
- #include <forward.h>
- #include <uri-references.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- #include "util/share.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/sp-use.h inkscape-0.48.1/src/sp-use.h
---- inkscape-0.48.1~/src/sp-use.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/sp-use.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "svg/svg-length.h"
- #include "sp-item.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/spiral-context.h inkscape-0.48.1/src/spiral-context.h
---- inkscape-0.48.1~/src/spiral-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/spiral-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -16,6 +16,7 @@
-  */
- 
- #include <gtk/gtktypeutils.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "libnr/nr-point.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/star-context.h inkscape-0.48.1/src/star-context.h
---- inkscape-0.48.1~/src/star-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/star-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "libnr/nr-point.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/strneq.h inkscape-0.48.1/src/strneq.h
---- inkscape-0.48.1~/src/strneq.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/strneq.h	2011-05-30 17:48:50.000000000 +0200
-@@ -2,6 +2,7 @@
- #define INKSCAPE_STRNEQ_H
- 
- #include <cstring>
-+#include <stddef.h>
- 
- /** Convenience/readability wrapper for strncmp(a,b,n)==0. */
- inline bool
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/style.h inkscape-0.48.1/src/style.h
---- inkscape-0.48.1~/src/style.h	2010-08-04 18:45:00.000000000 +0200
-+++ inkscape-0.48.1/src/style.h	2011-05-30 17:47:12.000000000 +0200
-@@ -24,6 +24,7 @@
- #include "uri.h"
- #include "sp-paint-server.h"
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- namespace Inkscape {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/text-context.h inkscape-0.48.1/src/text-context.h
---- inkscape-0.48.1~/src/text-context.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/text-context.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  */
- 
- /*  #include <gdk/gdkic.h> */
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtk/gtkimcontext.h>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/desktop-tracker.h inkscape-0.48.1/src/ui/dialog/desktop-tracker.h
---- inkscape-0.48.1~/src/ui/dialog/desktop-tracker.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/dialog/desktop-tracker.h	2011-05-30 17:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
- #ifndef SEEN_DIALOG_DESKTOP_TRACKER
- #define SEEN_DIALOG_DESKTOP_TRACKER
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <glib/gtypes.h>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/document-metadata.h inkscape-0.48.1/src/ui/dialog/document-metadata.h
---- inkscape-0.48.1~/src/ui/dialog/document-metadata.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/dialog/document-metadata.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- #define INKSCAPE_UI_DIALOG_DOCUMENT_METADATA_H
- 
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtkmm/notebook.h>
- #include <glibmm/i18n.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/document-properties.h inkscape-0.48.1/src/ui/dialog/document-properties.h
---- inkscape-0.48.1~/src/ui/dialog/document-properties.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/dialog/document-properties.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
- #define INKSCAPE_UI_DIALOG_DOCUMENT_PREFERENCES_H
- 
- #include <list>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>//
- #include <gtkmm/notebook.h>
- #include <glibmm/i18n.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/dialog/inkscape-preferences.h inkscape-0.48.1/src/ui/dialog/inkscape-preferences.h
---- inkscape-0.48.1~/src/ui/dialog/inkscape-preferences.h	2010-11-06 19:47:19.000000000 +0100
-+++ inkscape-0.48.1/src/ui/dialog/inkscape-preferences.h	2011-05-30 17:47:12.000000000 +0200
-@@ -28,6 +28,7 @@
- #include <gtkmm/frame.h>
- #include <gtkmm/notebook.h>
- #include "ui/widget/preferences-widget.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glibmm/i18n.h>
- #include <gtkmm/textview.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/control-point-selection.h inkscape-0.48.1/src/ui/tool/control-point-selection.h
---- inkscape-0.48.1~/src/ui/tool/control-point-selection.h	2010-08-04 18:45:00.000000000 +0200
-+++ inkscape-0.48.1/src/ui/tool/control-point-selection.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- 
- #include <memory>
- #include <boost/optional.hpp>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <2geom/forward.h>
- #include <2geom/point.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/control-point.h inkscape-0.48.1/src/ui/tool/control-point.h
---- inkscape-0.48.1~/src/ui/tool/control-point.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/tool/control-point.h	2011-05-30 17:47:12.000000000 +0200
-@@ -12,6 +12,7 @@
- #define SEEN_UI_TOOL_CONTROL_POINT_H
- 
- #include <boost/utility.hpp>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gdkmm.h>
- #include <gtkmm.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/manipulator.h inkscape-0.48.1/src/ui/tool/manipulator.h
---- inkscape-0.48.1~/src/ui/tool/manipulator.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/tool/manipulator.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
- 
- #include <set>
- #include <map>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glib.h>
- #include <gdk/gdk.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/multi-path-manipulator.h inkscape-0.48.1/src/ui/tool/multi-path-manipulator.h
---- inkscape-0.48.1~/src/ui/tool/multi-path-manipulator.h	2010-11-06 19:47:19.000000000 +0100
-+++ inkscape-0.48.1/src/ui/tool/multi-path-manipulator.h	2011-05-30 17:47:12.000000000 +0200
-@@ -11,6 +11,7 @@
- #ifndef SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
- #define SEEN_UI_TOOL_MULTI_PATH_MANIPULATOR_H
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include "display/display-forward.h"
- #include "forward.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/node-tool.h inkscape-0.48.1/src/ui/tool/node-tool.h
---- inkscape-0.48.1~/src/ui/tool/node-tool.h	2010-11-06 19:47:19.000000000 +0100
-+++ inkscape-0.48.1/src/ui/tool/node-tool.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <memory>
- #include <boost/ptr_container/ptr_map.hpp>
- #include <glib.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include "event-context.h"
- #include "forward.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/tool/node.h inkscape-0.48.1/src/ui/tool/node.h
---- inkscape-0.48.1~/src/ui/tool/node.h	2011-01-02 05:34:09.000000000 +0100
-+++ inkscape-0.48.1/src/ui/tool/node.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
- #include <iterator>
- #include <iosfwd>
- #include <stdexcept>
-+#include <stddef.h>
- #include <tr1/functional>
- #include <boost/utility.hpp>
- #include <boost/shared_ptr.hpp>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/view/view.h inkscape-0.48.1/src/ui/view/view.h
---- inkscape-0.48.1~/src/ui/view/view.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/view/view.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
-  */
- 
- #include <gdk/gdktypes.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include "message.h"
- #include "gc-managed.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/color-picker.h inkscape-0.48.1/src/ui/widget/color-picker.h
---- inkscape-0.48.1~/src/ui/widget/color-picker.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/widget/color-picker.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
- #ifndef __COLOR_PICKER_H__
- #define __COLOR_PICKER_H__
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <gtkmm/button.h>
- #include <gtkmm/dialog.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/page-sizer.h inkscape-0.48.1/src/ui/widget/page-sizer.h
---- inkscape-0.48.1~/src/ui/widget/page-sizer.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/widget/page-sizer.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
- #define INKSCAPE_UI_WIDGET_PAGE_SIZER__H
- 
- #include <gtkmm.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- #include "helper/units.h"
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/preferences-widget.h inkscape-0.48.1/src/ui/widget/preferences-widget.h
---- inkscape-0.48.1~/src/ui/widget/preferences-widget.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/widget/preferences-widget.h	2011-05-30 17:47:12.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <gtkmm/drawingarea.h>
- #include <gtkmm/frame.h>
- #include <gtkmm/filechooserbutton.h>
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- #include <glibmm/i18n.h>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/selected-style.h inkscape-0.48.1/src/ui/widget/selected-style.h
---- inkscape-0.48.1~/src/ui/widget/selected-style.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/widget/selected-style.h	2011-05-30 17:47:12.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <gtkmm/adjustment.h>
- #include <gtkmm/spinbutton.h>
- 
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- #include <glibmm/i18n.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/ui/widget/style-subject.h inkscape-0.48.1/src/ui/widget/style-subject.h
---- inkscape-0.48.1~/src/ui/widget/style-subject.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/ui/widget/style-subject.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- #include "libnr/nr-rect.h"
- #include <2geom/rect.h>
- #include "sp-item.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- class SPDesktop;
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/uri-references.h inkscape-0.48.1/src/uri-references.h
---- inkscape-0.48.1~/src/uri-references.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/uri-references.h	2011-05-30 17:47:12.000000000 +0200
-@@ -13,6 +13,7 @@
-  * Released under GNU GPL, read the file 'COPYING' for more information
-  */
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- #include <sigc++/trackable.h>
- 
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/forward-pointer-iterator.h inkscape-0.48.1/src/util/forward-pointer-iterator.h
---- inkscape-0.48.1~/src/util/forward-pointer-iterator.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/util/forward-pointer-iterator.h	2011-05-30 17:47:12.000000000 +0200
-@@ -15,6 +15,7 @@
- #define SEEN_INKSCAPE_UTIL_FORWARD_POINTER_ITERATOR_H
- 
- #include <iterator>
-+#include <stddef.h>
- #include "util/reference.h"
- 
- namespace Inkscape {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/share.h inkscape-0.48.1/src/util/share.h
---- inkscape-0.48.1~/src/util/share.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/util/share.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- 
- #include "gc-core.h"
- #include <cstring>
-+#include <stddef.h>
- 
- namespace Inkscape {
- namespace Util {
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/util/unordered-containers.h inkscape-0.48.1/src/util/unordered-containers.h
---- inkscape-0.48.1~/src/util/unordered-containers.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/util/unordered-containers.h	2011-05-30 17:47:12.000000000 +0200
-@@ -41,6 +41,8 @@
- # define INK_UNORDERED_MAP __gnu_cxx::hash_map
- # define INK_HASH __gnu_cxx::hash
- 
-+#include <stddef.h>
-+
- namespace __gnu_cxx {
- // hash function for pointers
- // TR1 and Boost have this defined by default, __gnu_cxx doesn't
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/desktop-widget.h inkscape-0.48.1/src/widgets/desktop-widget.h
---- inkscape-0.48.1~/src/widgets/desktop-widget.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/widgets/desktop-widget.h	2011-05-30 17:47:12.000000000 +0200
-@@ -21,6 +21,7 @@
- #include "ui/view/view-widget.h"
- #include "ui/view/edit-widget-interface.h"
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- // forward declaration
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/gradient-image.h inkscape-0.48.1/src/widgets/gradient-image.h
---- inkscape-0.48.1~/src/widgets/gradient-image.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/widgets/gradient-image.h	2011-05-30 17:47:12.000000000 +0200
-@@ -19,6 +19,7 @@
- 
- #include <glib.h>
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #define SP_TYPE_GRADIENT_IMAGE (sp_gradient_image_get_type ())
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/gradient-vector.h inkscape-0.48.1/src/widgets/gradient-vector.h
---- inkscape-0.48.1~/src/widgets/gradient-vector.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/widgets/gradient-vector.h	2011-05-30 17:47:12.000000000 +0200
-@@ -17,6 +17,7 @@
- 
- #include <glib.h>
- 
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #include <gtk/gtkvbox.h>
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/widgets/sp-attribute-widget.h inkscape-0.48.1/src/widgets/sp-attribute-widget.h
---- inkscape-0.48.1~/src/widgets/sp-attribute-widget.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/widgets/sp-attribute-widget.h	2011-05-30 17:47:12.000000000 +0200
-@@ -14,6 +14,7 @@
- #define SEEN_DIALOGS_SP_ATTRIBUTE_WIDGET_H
- 
- #include <glib.h>
-+#include <stddef.h>
- #include <sigc++/connection.h>
- 
- #define SP_TYPE_ATTRIBUTE_WIDGET (sp_attribute_widget_get_type ())
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape-0.48.1~/src/xml/helper-observer.h inkscape-0.48.1/src/xml/helper-observer.h
---- inkscape-0.48.1~/src/xml/helper-observer.h	2010-07-13 05:48:40.000000000 +0200
-+++ inkscape-0.48.1/src/xml/helper-observer.h	2011-05-30 17:47:12.000000000 +0200
-@@ -5,6 +5,7 @@
- #include "node.h"
- #include "../sp-object.h"
- //#include "../sp-object-repr.h"
-+#include <stddef.h>
- #include <sigc++/sigc++.h>
- 
- namespace Inkscape {

=== removed file 'debian/patches/fix-fontforge-glyph-template.dpatch'
--- debian/patches/fix-fontforge-glyph-template.dpatch	2011-06-01 18:05:51 +0000
+++ debian/patches/fix-fontforge-glyph-template.dpatch	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-# From: JazzyNico <[e-mail]>
-# Description: Fix layer structure in fontforge glyph template
-# Origin: upstream, https://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/9693
-# Bug: https://launchpad.net/bugs/565296
-# Bug-Ubuntu: https://launchpad.net/bugs/565296
-# Last-Update: 2011-05-30
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg inkscape_0.48.1-2ubuntu5/share/templates/fontforge_glyph.svg
---- inkscape_0.48.1-2ubuntu5~/share/templates/fontforge_glyph.svg	2011-05-30 17:38:10.000000000 +0100