diff -Nru gnome-desktop-2.30.0/aclocal.m4 gnome-desktop-2.30.2/aclocal.m4
--- gnome-desktop-2.30.0/aclocal.m4	2010-03-30 23:14:49.000000000 +0200
+++ gnome-desktop-2.30.2/aclocal.m4	2010-06-22 03:42:21.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -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.63],,
-[m4_warning([this file was generated for autoconf 2.63.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 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'.])])
@@ -34,7 +34,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -906,6 +906,14 @@
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
        am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
        ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pythondir], [$am_cv_python_pythondir])
@@ -936,6 +944,14 @@
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
        am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
        ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
diff -Nru gnome-desktop-2.30.0/ChangeLog gnome-desktop-2.30.2/ChangeLog
--- gnome-desktop-2.30.0/ChangeLog	2010-03-30 23:12:02.000000000 +0200
+++ gnome-desktop-2.30.2/ChangeLog	2010-06-22 03:40:49.000000000 +0200
@@ -1,6 +1,95 @@
+commit f4d16b7f45a784d60ba1bf6c6cc7332dfac55f8d
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date:   2010-06-20
+
+    Added Norwegian bokmål translation
+
+M	po/nb.po
+
+commit fe21ca389a09ff0b5171b070d320063aa734d6bd
+Author: Manoj Kumar Giri <mgiri@mgiri.csb>
+Date:	2010-05-18
+
+    Updated Oriya Translation
+
+M	po/or.po
+
+commit 4d8b4d8ec1e104d30aecd3425c7d34369853adab
+Author: Ivar Smolin <okul@linux.ee>
+Date:	2010-04-26
+
+    Estonian translation updated
+
+M	po/et.po
+
+commit 8516dd66b4d807d9295c7daaadf89d0c4de49b27
+Author: Peteris Krisjanis <pecisk@gmail.com>
+Date:	2010-04-24
+
+    Updated Latvian translation.
+
+M	po/lv.po
+
+commit b54cc0c4ef728328081158eac1b2af773ea36d08
+Author: Carles Ferrando <carles.ferrando@gmail.com>
+Date:	2010-04-21
+
+    Updated Catalan (Valencian) translation
+
+M	po/ca@valencia.po
+
+commit 93a2d820771a23ce6a938f5ff648df66f26c9fac
+Author: Shankar Prasad <svenkate@svenkate.pnq.redhat.com>
+Date:	2010-04-21
+
+    Updated Kannada translations
+
+M	po/kn.po
+
+commit 89ab8cc9ceda901dfc300c48345ad46f9ce6775c
+Author: Sandeep Shedmake <sshedmak@redhat.com>
+Date:	2010-04-13
+
+    Updated Marathi Translations
+
+M	po/mr.po
+
+commit da969dc613c57e61539a0882b2b775a45410f9de
+Author: Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>
+Date:	2010-04-06
+
+    Updated Malay translation for gnome-desktop
+
+M	po/ms.po
+
+commit 1ee3019ae5ebf4315ef6a81aa072c0fa09e3cb5e
+Author: Jordi Serratosa <jordis.lists@gmail.com>
+Date:	2010-04-02
+
+    Fixes to Catalan translation
+
+M	po/ca.po
+
+commit 3b628e0b63d57cfd499c16dc91770b4910a3ccc2
+Author: Vincent Untz <vuntz@gnome.org>
+Date:	2010-03-30
+
+    [release] post-release bump to 2.30.1
+
+M	configure.in
+
+commit 5664876ad99bd856c2341c5e29e190dcbc34bb39
+Author: Vincent Untz <vuntz@gnome.org>
+Date:	2010-03-30
+
+    [release] 2.30.0
+
+M	NEWS
+M	README
+
 commit 02a2110544e186f2e8597340d6635af5e5355fc0
 Author: Matthias Clasen <mclasen@redhat.com>
-Date:   2010-03-09
+Date:	2010-03-09
 
     Ignore errors when setting the monitor size fails
 
diff -Nru gnome-desktop-2.30.0/config.guess gnome-desktop-2.30.2/config.guess
--- gnome-desktop-2.30.0/config.guess	2010-03-30 23:14:54.000000000 +0200
+++ gnome-desktop-2.30.2/config.guess	2010-06-22 03:42:24.000000000 +0200
@@ -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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-27'
+timestamp='2009-11-20'
 
 # 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
@@ -27,16 +27,16 @@
 # the same distribution terms that you use for the rest of that program.
 
 
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# Originally written by Per Bothner.  Please send patches (context
+# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -333,6 +333,9 @@
     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
 	SUN_ARCH="i386"
@@ -656,7 +659,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -807,12 +810,12 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:[3456]*)
+    *:Interix*:*)
     	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd | genuineintel)
+	    authenticamd | genuineintel | EM64T)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -822,6 +825,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -851,6 +857,20 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+        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}
+	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -873,6 +893,17 @@
     frv:Linux:*:*)
     	echo frv-unknown-linux-gnu
 	exit ;;
+    i*86:Linux:*:*)
+	LIBC=gnu
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#ifdef __dietlibc__
+	LIBC=dietlibc
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	exit ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
@@ -882,78 +913,34 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips64
-	#undef mips64el
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
 	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -962,8 +949,11 @@
 	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-gnu
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
@@ -986,66 +976,6 @@
     xtensa*:Linux:*:*)
     	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@@ -1074,7 +1004,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1182,7 +1112,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1275,6 +1205,16 @@
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
+	    i386)
+		eval $set_cc_for_build
+		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		      grep IS_64BIT_ARCH >/dev/null
+		  then
+		      UNAME_PROCESSOR="x86_64"
+		  fi
+		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
diff -Nru gnome-desktop-2.30.0/config.h.in gnome-desktop-2.30.2/config.h.in
--- gnome-desktop-2.30.0/config.h.in	2010-03-30 23:14:53.000000000 +0200
+++ gnome-desktop-2.30.2/config.h.in	2010-06-22 03:42:23.000000000 +0200
@@ -79,6 +79,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
diff -Nru gnome-desktop-2.30.0/config.sub gnome-desktop-2.30.2/config.sub
--- gnome-desktop-2.30.0/config.sub	2010-03-30 23:14:54.000000000 +0200
+++ gnome-desktop-2.30.2/config.sub	2010-06-22 03:42:24.000000000 +0200
@@ -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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2009-04-17'
+timestamp='2009-11-20'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -32,13 +32,16 @@
 
 
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
+# diff and a properly formatted GNU ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@@ -149,10 +152,13 @@
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
+	-apple | -axis | -knuth | -cray | -microblaze)
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -281,6 +287,7 @@
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
+	| rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
@@ -288,13 +295,14 @@
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
+	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
+	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -337,7 +345,7 @@
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -365,7 +373,7 @@
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* \
+	| 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-* \
@@ -374,6 +382,7 @@
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
+	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -467,6 +476,10 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -719,6 +732,9 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
+        microblaze)
+		basic_machine=microblaze-xilinx
+		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@@ -1240,6 +1256,9 @@
         # 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
+		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@@ -1260,9 +1279,9 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -kopensolaris* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
@@ -1283,7 +1302,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1613,7 +1632,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
diff -Nru gnome-desktop-2.30.0/configure gnome-desktop-2.30.2/configure
--- gnome-desktop-2.30.0/configure	2010-03-30 23:14:53.000000000 +0200
+++ gnome-desktop-2.30.2/configure	2010-06-22 03:42:23.000000000 +0200
@@ -1,20 +1,24 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for gnome-desktop 2.30.0.
+# Generated by GNU Autoconf 2.65 for gnome-desktop 2.30.2.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -22,23 +26,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -46,7 +42,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -57,7 +59,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -80,13 +82,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -96,15 +91,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -116,12 +111,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -133,330 +132,301 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
 # CDPATH.
-$as_unset CDPATH
-
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 if test "x$CONFIG_SHELL" = x; then
-  if (eval ":") 2>/dev/null; then
-  as_have_required=yes
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
 else
-  as_have_required=no
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
-
-  if test $as_have_required = yes &&	 (eval ":
-(as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
 
 exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_have_required=no
 fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=\$LINENO
-  as_lineno_2=\$LINENO
-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
-  :
 else
-  as_candidate_shells=
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  case $as_dir in
+  as_found=:
+  case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
 	   done;;
        esac
+  as_found=false
 done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
 IFS=$as_save_IFS
 
 
-      for as_shell in $as_candidate_shells $SHELL; do
-	 # Try only shells that exist, to save several forks.
-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-_ASEOF
-}; then
-  CONFIG_SHELL=$as_shell
-	       as_have_required=yes
-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
-esac
-
-fi
-
-
-:
-(as_func_return () {
-  (exit $1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
-
-exitcode=0
-if as_func_success; then
-  :
-else
-  exitcode=1
-  echo as_func_success failed.
-fi
-
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
-
-if as_func_ret_success; then
-  :
-else
-  exitcode=1
-  echo as_func_ret_success failed.
-fi
-
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
-fi
-
-if ( set x; as_func_ret_success y && test x = "$1" ); then
-  :
-else
-  exitcode=1
-  echo positional parameters were not saved.
-fi
-
-test $exitcode = 0) || { (exit 1); exit 1; }
-
-(
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-
-_ASEOF
-}; then
-  break
-fi
-
-fi
-
-      done
-
-      if test "x$CONFIG_SHELL" != x; then
-  for as_var in BASH_ENV ENV
-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-	done
+      if test "x$CONFIG_SHELL" != x; then :
+  # 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.
+	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+"$@"}
 fi
 
-
-    if test $as_have_required = no; then
-  echo This script requires a shell more modern than all the
-      echo shells that I found on your system.  Please install a
-      echo modern shell, or manually run the script under such a
-      echo shell if you do have one.
-      { (exit 1); exit 1; }
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop
+$0: about your system, including any error possibly output
+$0: before this message. Then install a modern shell, or
+$0: manually run the script under such a shell if you do
+$0: have one."
+  fi
+  exit 1
 fi
-
-
 fi
-
 fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
 
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
 
 
-(eval "as_func_return () {
-  (exit \$1)
-}
-as_func_success () {
-  as_func_return 0
-}
-as_func_failure () {
-  as_func_return 1
-}
-as_func_ret_success () {
-  return 0
-}
-as_func_ret_failure () {
-  return 1
-}
+} # as_fn_mkdir_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
 
-exitcode=0
-if as_func_success; then
-  :
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
 else
-  exitcode=1
-  echo as_func_success failed.
-fi
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
 
-if as_func_failure; then
-  exitcode=1
-  echo as_func_failure succeeded.
-fi
 
-if as_func_ret_success; then
-  :
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
 else
-  exitcode=1
-  echo as_func_ret_success failed.
+  as_expr=false
 fi
 
-if as_func_ret_failure; then
-  exitcode=1
-  echo as_func_ret_failure succeeded.
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
 fi
 
-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-  :
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
 else
-  exitcode=1
-  echo positional parameters were not saved.
+  as_dirname=false
 fi
 
-test \$exitcode = 0") || {
-  echo No shell found that supports shell functions.
-  echo Please tell bug-autoconf@gnu.org about your system,
-  echo including any error possibly output before this message.
-  echo This can help us improve future autoconf versions.
-  echo Configuration will now proceed without shell functions.
-}
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
 
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
   sed -n '
     p
     /[$]LINENO/=
@@ -473,8 +443,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
@@ -484,29 +453,18 @@
   exit
 }
 
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -536,7 +494,7 @@
 rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -555,10 +513,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -573,7 +531,6 @@
 
 
 
-
 # Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
@@ -722,7 +679,8 @@
 
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -740,14 +698,14 @@
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
 
 # Identity of this package.
 PACKAGE_NAME='gnome-desktop'
 PACKAGE_TARNAME='gnome-desktop'
-PACKAGE_VERSION='2.30.0'
-PACKAGE_STRING='gnome-desktop 2.30.0'
+PACKAGE_VERSION='2.30.2'
+PACKAGE_STRING='gnome-desktop 2.30.2'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop'
+PACKAGE_URL=''
 
 ac_unique_file="libgnome-desktop"
 # Factoring default headers for most tests.
@@ -1002,6 +960,7 @@
 program_transform_name
 prefix
 exec_prefix
+PACKAGE_URL
 PACKAGE_BUGREPORT
 PACKAGE_STRING
 PACKAGE_VERSION
@@ -1163,8 +1122,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1190,8 +1148,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1395,8 +1352,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1412,8 +1368,7 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
-   { (exit 1); exit 1; }; }
+      as_fn_error "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
@@ -1443,17 +1398,17 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information."
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
+    esac
     eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
@@ -1470,15 +1425,13 @@
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "missing argument to $ac_option"
 fi
 
 if test -n "$ac_unrecognized_opts"; then
   case $enable_option_checking in
     no) ;;
-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
-   { (exit 1); exit 1; }; } ;;
+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
@@ -1501,8 +1454,7 @@
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
@@ -1532,11 +1484,9 @@
 ac_pwd=`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=`ls -di .` &&
 ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "working directory cannot be determined"
 test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "pwd does not report name of working directory"
 
 
 # Find the source files, if location was not specified.
@@ -1575,13 +1525,11 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
 fi
 ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
-   { (exit 1); exit 1; }; }
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
 	pwd)`
 # When building in place, set srcdir=.
 if test "$ac_abs_confdir" = "$ac_pwd"; then
@@ -1607,7 +1555,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 gnome-desktop 2.30.0 to adapt to many kinds of systems.
+\`configure' configures gnome-desktop 2.30.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1681,7 +1629,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gnome-desktop 2.30.0:";;
+     short | recursive ) echo "Configuration of gnome-desktop 2.30.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1710,9 +1658,9 @@
   --disable-deprecations  don't warn about deprecated usages
   --disable-scrollkeeper  do not make updates to the scrollkeeper database
   --disable-rebuilds      disable all source autogeneration rules
-  --enable-gtk-doc        use gtk-doc to build documentation [default=no]
-  --enable-gtk-doc-html   build documentation in html format [default=yes]
-  --enable-gtk-doc-pdf    build documentation in pdf format [default=no]
+  --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
+  --enable-gtk-doc-html   build documentation in html format [[default=yes]]
+  --enable-gtk-doc-pdf    build documentation in pdf format [[default=no]]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1735,7 +1683,7 @@
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
   LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
@@ -1813,22 +1761,379 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gnome-desktop configure 2.30.0
-generated by GNU Autoconf 2.63
+gnome-desktop configure 2.30.2
+generated by GNU Autoconf 2.65
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
   exit
 fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # 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;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       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;}
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( cat <<\_ASBOX
+## ---------------------------------------------------------------------------- ##
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop ##
+## ---------------------------------------------------------------------------- ##
+_ASBOX
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $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;}
+
+} # ac_fn_c_check_header_mongrel
 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 gnome-desktop $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+It was created by gnome-desktop $as_me 2.30.2, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1864,8 +2169,8 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  $as_echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
 IFS=$as_save_IFS
 
 } >&5
@@ -1902,9 +2207,9 @@
       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
@@ -1920,13 +2225,13 @@
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args '$ac_arg'"
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
@@ -1951,13 +2256,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -2029,39 +2334,41 @@
     exit $exit_status
 ' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
+$as_echo "/* confdefs.h */" > confdefs.h
+
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
@@ -2079,8 +2386,8 @@
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file"
@@ -2088,10 +2395,10 @@
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
@@ -2099,7 +2406,7 @@
     esac
   fi
 else
-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
 $as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -2114,11 +2421,11 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
@@ -2128,17 +2435,17 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
 $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
 $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
@@ -2150,43 +2457,20 @@
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -2201,24 +2485,16 @@
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
+  for ac_t in install-sh install.sh shtool; do
+    if test -f "$ac_dir/$ac_t"; then
+      ac_aux_dir=$ac_dir
+      ac_install_sh="$ac_aux_dir/$ac_t -c"
+      break 2
+    fi
+  done
 done
 if test -z "$ac_aux_dir"; then
-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2244,10 +2520,10 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+{ $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 test "${ac_cv_path_install+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2255,11 +2531,11 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -2296,7 +2572,7 @@
     ;;
 esac
 
-done
+  done
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
@@ -2312,7 +2588,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
 $as_echo "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2323,7 +2599,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
 # Just in case
 sleep 1
@@ -2334,15 +2610,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
-   { (exit 1); exit 1; }; };;
+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2364,11 +2636,8 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+alias in your environment" "$LINENO" 5
    fi
 
    test "$2" = conftest.file
@@ -2377,13 +2646,10 @@
    # Ok.
    :
 else
-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-$as_echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
@@ -2411,7 +2677,7 @@
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -2432,9 +2698,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2445,24 +2711,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2472,9 +2738,9 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2485,24 +2751,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2511,7 +2777,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -2524,10 +2790,10 @@
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 
-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+{ $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 test "${ac_cv_path_mkdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2535,7 +2801,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in mkdir gmkdir; do
+    for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
@@ -2547,11 +2813,12 @@
 	   esac
 	 done
        done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2559,11 +2826,10 @@
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
 mkdir_p="$MKDIR_P"
@@ -2576,9 +2842,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2589,24 +2855,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2614,11 +2880,11 @@
   test -n "$AWK" && break
 done
 
-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2636,11 +2902,11 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
   SET_MAKE=
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2660,9 +2926,7 @@
   am__isrc=' -I$(srcdir)'
   # test to see if srcdir already configured
   if test -f $srcdir/config.status; then
-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
   fi
 fi
 
@@ -2678,7 +2942,7 @@
 
 # Define the identity of the package.
  PACKAGE='gnome-desktop'
- VERSION='2.30.0'
+ VERSION='2.30.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2713,7 +2977,7 @@
 AMTAR=${AMTAR-"${am_missing_run}tar"}
 
 
-{ $as_echo "$as_me:$LINENO: checking how to create a ustar tar archive" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5
 $as_echo_n "checking how to create a ustar tar archive... " >&6; }
 # Loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar plaintar pax cpio none'
@@ -2786,13 +3050,13 @@
 done
 rm -rf conftest.dir
 
-if test "${am_cv_prog_tar_ustar+set}" = set; then
+if test "${am_cv_prog_tar_ustar+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_prog_tar_ustar=$_am_tool
 fi
 
-{ $as_echo "$as_me:$LINENO: result: $am_cv_prog_tar_ustar" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5
 $as_echo "$am_cv_prog_tar_ustar" >&6; }
 
 
@@ -2800,7 +3064,7 @@
 
 
 # Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then
+if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
@@ -2832,16 +3096,16 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
+if test "${enable_maintainer_mode+set}" = set; then :
   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
 else
   USE_MAINTAINER_MODE=no
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
 $as_echo "$USE_MAINTAINER_MODE" >&6; }
    if test $USE_MAINTAINER_MODE = yes; then
   MAINTAINER_MODE_TRUE=
@@ -2856,16 +3120,16 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then
+if test "${enable_nls+set}" = set; then :
   enableval=$enable_nls; USE_NLS=$enableval
 else
   USE_NLS=yes
 fi
 
-  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
 $as_echo "$USE_NLS" >&6; }
 
 
@@ -2881,7 +3145,7 @@
 .PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
 $as_echo_n "checking for style of include used by $am_make... " >&6; }
 am__include="#"
 am__quote=
@@ -2909,12 +3173,12 @@
 fi
 
 
-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
 $as_echo "$_am_result" >&6; }
 rm -f confinc confmf
 
 # Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
+if test "${enable_dependency_tracking+set}" = set; then :
   enableval=$enable_dependency_tracking;
 fi
 
@@ -2939,9 +3203,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -2952,24 +3216,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -2979,9 +3243,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -2992,24 +3256,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3018,7 +3282,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3032,9 +3296,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3045,24 +3309,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3072,9 +3336,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3086,18 +3350,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -3116,10 +3380,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3131,9 +3395,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3144,24 +3408,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3175,9 +3439,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -3188,24 +3452,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -3218,7 +3482,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -3229,57 +3493,37 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3295,8 +3539,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
 ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
@@ -3312,17 +3556,17 @@
 done
 rm -f $ac_rmfiles
 
-if { (ac_try="$ac_link_default"
+if { { ac_try="$ac_link_default"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
 # in a Makefile.  We should not override ac_cv_exeext if it was cached,
@@ -3339,7 +3583,7 @@
 	# certainly right.
 	break;;
     *.* )
-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
@@ -3358,84 +3602,42 @@
 else
   ac_file=''
 fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
-  $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }; }
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-$as_echo "yes" >&6; }
-
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
 $as_echo_n "checking for suffix of executables... " >&6; }
-if { (ac_try="$ac_link"
+if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
@@ -3450,32 +3652,83 @@
   esac
 done
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
 $as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+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 test "${ac_cv_objext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3487,17 +3740,17 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (ac_try="$ac_compile"
+if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -3510,31 +3763,23 @@
   $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details." "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
 $as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $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 test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3548,37 +3793,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -3587,20 +3811,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $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 test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3611,35 +3831,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3650,36 +3846,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -3690,42 +3862,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -3742,18 +3889,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $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 test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -3810,32 +3953,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -3846,17 +3966,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -3866,9 +3988,9 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $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 test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3976,7 +4098,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -3996,35 +4118,31 @@
 
 case "$am__api_version" in
     1.01234)
-	{ { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
     ;;
     *)
     ;;
 esac
 
 if test -n "0.40.0"; then
-    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
 $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
 
     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
     INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
     INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
 
-    { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.40.0 or later." >&5
-$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.40.0 or later." >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Your intltool is too old.  You need intltool 0.40.0 or later." "$LINENO" 5
 fi
 
 # Extract the first word of "intltool-update", so it can be a program name with args.
 set dummy intltool-update; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_UPDATE in
@@ -4037,14 +4155,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4052,19 +4170,19 @@
 fi
 INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
 if test -n "$INTLTOOL_UPDATE"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
 $as_echo "$INTLTOOL_UPDATE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "intltool-merge", so it can be a program name with args.
 set dummy intltool-merge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_MERGE in
@@ -4077,14 +4195,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4092,19 +4210,19 @@
 fi
 INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
 if test -n "$INTLTOOL_MERGE"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
 $as_echo "$INTLTOOL_MERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "intltool-extract", so it can be a program name with args.
 set dummy intltool-extract; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_EXTRACT in
@@ -4117,14 +4235,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4132,18 +4250,16 @@
 fi
 INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
 if test -n "$INTLTOOL_EXTRACT"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
 $as_echo "$INTLTOOL_EXTRACT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-    { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
 fi
 
   INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4265,9 +4381,9 @@
 # Check the gettext tools to make sure they are GNU
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $XGETTEXT in
@@ -4280,14 +4396,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4295,19 +4411,19 @@
 fi
 XGETTEXT=$ac_cv_path_XGETTEXT
 if test -n "$XGETTEXT"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_MSGMERGE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGMERGE in
@@ -4320,14 +4436,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4335,19 +4451,19 @@
 fi
 MSGMERGE=$ac_cv_path_MSGMERGE
 if test -n "$MSGMERGE"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
 $as_echo "$MSGMERGE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MSGFMT in
@@ -4360,14 +4476,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4375,19 +4491,19 @@
 fi
 MSGFMT=$ac_cv_path_MSGFMT
 if test -n "$MSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -4400,14 +4516,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -4416,33 +4532,29 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
 fi
 
 # Extract the first word of "perl", so it can be a program name with args.
 set dummy perl; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $INTLTOOL_PERL in
@@ -4455,14 +4567,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -4470,41 +4582,35 @@
 fi
 INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
 if test -n "$INTLTOOL_PERL"; then
-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
 $as_echo "$INTLTOOL_PERL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 if test -z "$INTLTOOL_PERL"; then
-   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
-$as_echo "$as_me: error: perl not found" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "perl not found" "$LINENO" 5
 fi
-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
 $as_echo_n "checking for perl >= 5.8.1... " >&6; }
 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
 if test $? -ne 0; then
-   { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
 else
    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
 $as_echo "$IT_PERL_VERSION" >&6; }
 fi
 if test "x" != "xno-xml"; then
-   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
 $as_echo_n "checking for XML::Parser... " >&6; }
    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-       { $as_echo "$as_me:$LINENO: result: ok" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
    else
-       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
    fi
 fi
 
@@ -4514,11 +4620,7 @@
 # Set DATADIRNAME correctly if it is not set yet
 # (copied from glib-gettext.m4)
 if test -z "$DATADIRNAME"; then
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -4530,61 +4632,41 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   DATADIRNAME=share
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	case $host in
+  case $host in
     *-*-solaris*)
-                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  $as_echo_n "(cached) " >&6
+                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+  DATADIRNAME=share
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+  DATADIRNAME=lib
+fi
+
+    ;;
+    *)
+    DATADIRNAME=lib
+    ;;
+    esac
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+
 
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char bind_textdomain_codeset (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
 
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
 
-#undef bind_textdomain_codeset
+
+
+{ $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 :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -4592,104 +4674,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
-
+char strerror ();
 int
 main ()
 {
-return bind_textdomain_codeset ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_bind_textdomain_codeset=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-  DATADIRNAME=share
-else
-  DATADIRNAME=lib
-fi
-
-    ;;
-    *)
-    DATADIRNAME=lib
-    ;;
-    esac
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-
-
-
-
-
-
-{ $as_echo "$as_me:$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
-  $as_echo_n "(cached) " >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char strerror ();
-int
-main ()
-{
-return strerror ();
+return strerror ();
   ;
   return 0;
 }
@@ -4701,54 +4690,27 @@
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_strerror=$ac_res
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_strerror+set}" = set; then
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext
+  if test "${ac_cv_search_strerror+set}" = set; then :
   break
 fi
 done
-if test "${ac_cv_search_strerror+set}" = set; then
-  :
+if test "${ac_cv_search_strerror+set}" = set; then :
+
 else
   ac_cv_search_strerror=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5
 $as_echo "$ac_cv_search_strerror" >&6; }
 ac_res=$ac_cv_search_strerror
-if test "$ac_res" != no; then
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -4761,9 +4723,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4774,24 +4736,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4801,9 +4763,9 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4814,24 +4776,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4840,7 +4802,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -4854,9 +4816,9 @@
           if test -n "$ac_tool_prefix"; then
     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4867,24 +4829,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4894,9 +4856,9 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4908,18 +4870,18 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
@@ -4938,10 +4900,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4953,9 +4915,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4966,24 +4928,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
 $as_echo "$CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -4997,9 +4959,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -5010,24 +4972,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
 $as_echo "$ac_ct_CC" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -5040,7 +5002,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -5051,62 +5013,42 @@
 fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+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_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "no acceptable C compiler found in \$PATH
+See \`config.log' for more details." "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-{ (ac_try="$ac_compiler --version >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler --version >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -v >&5") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compiler -V >&5") 2>&5
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
 
-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+{ $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 test "${ac_cv_c_compiler_gnu+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5120,37 +5062,16 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
 $as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
@@ -5159,20 +5080,16 @@
 fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+{ $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 test "${ac_cv_prog_cc_g+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
-   cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5183,35 +5100,11 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	CFLAGS=""
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5222,36 +5115,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_compile "$LINENO"; then :
 
-	ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -5262,42 +5131,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
 $as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -5314,18 +5158,14 @@
     CFLAGS=
   fi
 fi
-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+{ $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 test "${ac_cv_prog_cc_c89+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
@@ -5382,32 +5222,9 @@
 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
 rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
@@ -5418,17 +5235,19 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
 $as_echo "none needed" >&6; } ;;
   xno)
-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
 $as_echo "unsupported" >&6; } ;;
   *)
     CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
 
+fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5438,9 +5257,9 @@
 
 depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+{ $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 test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5548,7 +5367,7 @@
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -5568,14 +5387,14 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+{ $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; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
+  if test "${ac_cv_prog_CPP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -5590,11 +5409,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5603,78 +5418,34 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+if $ac_preproc_ok; then :
   break
 fi
 
@@ -5686,7 +5457,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
 $as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -5697,11 +5468,7 @@
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
@@ -5710,87 +5477,40 @@
 #endif
 		     Syntax error
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_cpp "$LINENO"; then :
 
+else
   # Broken: fails on valid input.
 continue
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
   # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-
 rm -f conftest.err conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+if $ac_preproc_ok; then :
+
 else
-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }; }
+as_fn_error "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details." "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5800,9 +5520,9 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $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 test "${ac_cv_path_GREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -5813,7 +5533,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in grep ggrep; do
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
@@ -5833,7 +5553,7 @@
     $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_GREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_GREP="$ac_path_GREP"
@@ -5848,26 +5568,24 @@
       $ac_path_GREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_GREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_GREP=$GREP
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+{ $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 test "${ac_cv_path_EGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5881,7 +5599,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in egrep; do
+    for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
@@ -5901,7 +5619,7 @@
     $as_echo 'EGREP' >> "conftest.nl"
     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_EGREP="$ac_path_EGREP"
@@ -5916,12 +5634,10 @@
       $ac_path_EGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_EGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_EGREP=$EGREP
@@ -5929,21 +5645,17 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP="$ac_cv_path_EGREP"
 
 
-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $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 test "${ac_cv_header_stdc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5958,48 +5670,23 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -6009,18 +5696,14 @@
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
@@ -6030,14 +5713,10 @@
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
 #include <stdlib.h>
@@ -6064,85 +5743,48 @@
   return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_run "$LINENO"; then :
 
-( exit $ac_status )
-ac_cv_header_stdc=no
+else
+  ac_cv_header_stdc=no
 fi
-rm -rf conftest.dSYM
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
 $as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
 
-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+{ $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 test "${ac_cv_build+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -6158,28 +5800,24 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+{ $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 test "${ac_cv_host+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
-   { (exit 1); exit 1; }; };;
+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -6202,9 +5840,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_AS+set}" = set; then
+if test "${ac_cv_prog_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AS"; then
@@ -6215,24 +5853,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AS="${ac_tool_prefix}as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  { $as_echo "$as_me:$LINENO: result: $AS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
 $as_echo "$AS" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6242,9 +5880,9 @@
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_AS+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AS"; then
@@ -6255,24 +5893,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AS="as"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
 $as_echo "$ac_ct_AS" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6281,7 +5919,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6294,9 +5932,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_DLLTOOL+set}" = set; then
+if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DLLTOOL"; then
@@ -6307,24 +5945,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
 $as_echo "$DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6334,9 +5972,9 @@
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_DLLTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DLLTOOL"; then
@@ -6347,24 +5985,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
 $as_echo "$ac_ct_DLLTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6373,7 +6011,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6386,9 +6024,9 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -6399,24 +6037,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6426,9 +6064,9 @@
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -6439,24 +6077,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6465,7 +6103,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6500,7 +6138,7 @@
 
 case `pwd` in
   *\ * | *\	*)
-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
 $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
 esac
 
@@ -6523,9 +6161,9 @@
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then
+if test "${ac_cv_path_SED+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -6533,7 +6171,7 @@
        ac_script="$ac_script$as_nl$ac_script"
      done
      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     $as_unset ac_script || ac_script=
+     { ac_script=; unset ac_script;}
      if test -z "$SED"; then
   ac_path_SED_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
@@ -6542,7 +6180,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in sed gsed; do
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
@@ -6562,7 +6200,7 @@
     $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_SED_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_SED="$ac_path_SED"
@@ -6577,19 +6215,17 @@
       $ac_path_SED_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_SED"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
   fi
 else
   ac_cv_path_SED=$SED
 fi
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
 $as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
@@ -6607,9 +6243,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then
+if test "${ac_cv_path_FGREP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -6623,7 +6259,7 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_prog in fgrep; do
+    for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
@@ -6643,7 +6279,7 @@
     $as_echo 'FGREP' >> "conftest.nl"
     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    ac_count=`expr $ac_count + 1`
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
       # Best one so far, save it but keep looking for a better one
       ac_cv_path_FGREP="$ac_path_FGREP"
@@ -6658,12 +6294,10 @@
       $ac_path_FGREP_found && break 3
     done
   done
-done
+  done
 IFS=$as_save_IFS
   if test -z "$ac_cv_path_FGREP"; then
-    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
   fi
 else
   ac_cv_path_FGREP=$FGREP
@@ -6671,7 +6305,7 @@
 
    fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
 $as_echo "$ac_cv_path_FGREP" >&6; }
  FGREP="$ac_cv_path_FGREP"
 
@@ -6697,7 +6331,7 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
 else
   with_gnu_ld=no
@@ -6706,7 +6340,7 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
 $as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
@@ -6736,13 +6370,13 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
 $as_echo_n "checking for GNU ld... " >&6; }
 else
-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then
+if test "${lt_cv_path_LD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -6773,18 +6407,16 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
 $as_echo "$LD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -6797,7 +6429,7 @@
   ;;
 esac
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
 $as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
@@ -6809,9 +6441,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then
+if test "${lt_cv_path_NM+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -6858,7 +6490,7 @@
   : ${lt_cv_path_NM=no}
 fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
 $as_echo "$lt_cv_path_NM" >&6; }
 if test "$lt_cv_path_NM" != "no"; then
   NM="$lt_cv_path_NM"
@@ -6869,9 +6501,9 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -6882,24 +6514,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DUMPBIN=$ac_cv_prog_DUMPBIN
 if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
 $as_echo "$DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6913,9 +6545,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_DUMPBIN+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -6926,24 +6558,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
 if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
 $as_echo "$ac_ct_DUMPBIN" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -6956,7 +6588,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -6976,44 +6608,44 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then
+if test "${lt_cv_nm_interface+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:6986: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:6618: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6989: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6621: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6992: output\"" >&5)
+  (eval echo "\"\$as_me:6624: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
   fi
   rm -f conftest*
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
 $as_echo "$lt_cv_nm_interface" >&6; }
 
-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
 $as_echo_n "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
 $as_echo "no, using $LN_S" >&6; }
 fi
 
 # find the maximum length of command line arguments
-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -7131,10 +6763,10 @@
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
 $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: none" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
 $as_echo "none" >&6; }
 fi
 max_cmd_len=$lt_cv_sys_max_cmd_len
@@ -7148,7 +6780,7 @@
 : ${MV="mv -f"}
 : ${RM="rm -f"}
 
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
 $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
 # Try some XSI features
 xsi_shell=no
@@ -7158,17 +6790,17 @@
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
 $as_echo "$xsi_shell" >&6; }
 
 
-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
 $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
 lt_shell_append=no
 ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
     >/dev/null 2>&1 \
   && lt_shell_append=yes
-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
 $as_echo "$lt_shell_append" >&6; }
 
 
@@ -7203,14 +6835,14 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then
+if test "${lt_cv_ld_reload_flag+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
 $as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
@@ -7239,9 +6871,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -7252,24 +6884,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
 $as_echo "$OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7279,9 +6911,9 @@
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OBJDUMP+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -7292,24 +6924,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
 $as_echo "$ac_ct_OBJDUMP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7318,7 +6950,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7335,9 +6967,9 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then
+if test "${lt_cv_deplibs_check_method+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -7531,7 +7163,7 @@
 esac
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
@@ -7551,9 +7183,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_AR+set}" = set; then
+if test "${ac_cv_prog_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
@@ -7564,24 +7196,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
 $as_echo "$AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7591,9 +7223,9 @@
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_AR+set}" = set; then
+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
@@ -7604,24 +7236,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR="ar"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
 $as_echo "$ac_ct_AR" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7630,7 +7262,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7656,9 +7288,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -7669,24 +7301,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
 $as_echo "$STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7696,9 +7328,9 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -7709,24 +7341,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
 $as_echo "$ac_ct_STRIP" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7735,7 +7367,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7755,9 +7387,9 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -7768,24 +7400,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
 $as_echo "$RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7795,9 +7427,9 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -7808,24 +7440,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
 $as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -7834,7 +7466,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -7912,9 +7544,9 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -8030,18 +7662,18 @@
 int main(){nm_test_var='a';nm_test_func();return(0);}
 _LT_EOF
 
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -8094,11 +7726,11 @@
 	  lt_save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
 	  LIBS="$lt_save_LIBS"
@@ -8132,10 +7764,10 @@
   lt_cv_sys_global_symbol_to_cdecl=
 fi
 if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  { $as_echo "$as_me:$LINENO: result: failed" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
 $as_echo "failed" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: ok" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
 $as_echo "ok" >&6; }
 fi
 
@@ -8161,7 +7793,7 @@
 
 
 # Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
+if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -8173,11 +7805,11 @@
 ia64-*-hpux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
       *ELF-32*)
 	HPUX_IA64_MODE="32"
@@ -8191,12 +7823,12 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 8194 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  echo '#line 7826 "configure"' > conftest.$ac_ext
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
 	*32-bit*)
@@ -8230,11 +7862,11 @@
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
@@ -8283,9 +7915,9 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then
+if test "${lt_cv_cc_needs_belf+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -8294,11 +7926,7 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8309,38 +7937,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_cc_needs_belf=no
+  lt_cv_cc_needs_belf=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
      ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8348,7 +7951,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
 $as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -8358,11 +7961,11 @@
 sparc*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
@@ -8388,9 +7991,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -8401,24 +8004,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
 $as_echo "$DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8428,9 +8031,9 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_DSYMUTIL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -8441,24 +8044,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
 $as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8467,7 +8070,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8480,9 +8083,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -8493,24 +8096,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
 $as_echo "$NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8520,9 +8123,9 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_NMEDIT+set}" = set; then
+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -8533,24 +8136,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
 $as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8559,7 +8162,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8572,9 +8175,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_LIPO+set}" = set; then
+if test "${ac_cv_prog_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -8585,24 +8188,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 LIPO=$ac_cv_prog_LIPO
 if test -n "$LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
 $as_echo "$LIPO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8612,9 +8215,9 @@
   ac_ct_LIPO=$LIPO
   # Extract the first word of "lipo", so it can be a program name with args.
 set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_LIPO+set}" = set; then
+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -8625,24 +8228,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
 if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
 $as_echo "$ac_ct_LIPO" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8651,7 +8254,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8664,9 +8267,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OTOOL+set}" = set; then
+if test "${ac_cv_prog_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -8677,24 +8280,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL=$ac_cv_prog_OTOOL
 if test -n "$OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
 $as_echo "$OTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8704,9 +8307,9 @@
   ac_ct_OTOOL=$OTOOL
   # Extract the first word of "otool", so it can be a program name with args.
 set dummy otool; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OTOOL+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -8717,24 +8320,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
 if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
 $as_echo "$ac_ct_OTOOL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8743,7 +8346,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8756,9 +8359,9 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -8769,24 +8372,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 OTOOL64=$ac_cv_prog_OTOOL64
 if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
 $as_echo "$OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8796,9 +8399,9 @@
   ac_ct_OTOOL64=$OTOOL64
   # Extract the first word of "otool64", so it can be a program name with args.
 set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_OTOOL64+set}" = set; then
+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -8809,24 +8412,24 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
 if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
 $as_echo "$ac_ct_OTOOL64" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -8835,7 +8438,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -8871,9 +8474,9 @@
 
 
 
-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -8898,22 +8501,18 @@
 	rm -f conftest.*
       fi
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -8924,42 +8523,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_ld_exported_symbols_list=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	lt_cv_ld_exported_symbols_list=no
+  lt_cv_ld_exported_symbols_list=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[012])
@@ -8997,69 +8571,14 @@
   esac
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+eval as_val=\$$as_ac_Header
+   if test "x$as_val" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
@@ -9069,62 +8588,13 @@
 done
 
 
-
 for ac_header in dlfcn.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_DLFCN_H 1
 _ACEOF
 
 fi
@@ -9142,7 +8612,7 @@
 
 
             # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then
+if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared; p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -9173,7 +8643,7 @@
 
 
   # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
+if test "${enable_static+set}" = set; then :
   enableval=$enable_static; p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -9205,7 +8675,7 @@
 
 
 # Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then
+if test "${with_pic+set}" = set; then :
   withval=$with_pic; pic_mode="$withval"
 else
   pic_mode=default
@@ -9221,7 +8691,7 @@
 
 
   # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
+if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install; p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -9302,9 +8772,9 @@
    setopt NO_GLOB_SUBST
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then
+if test "${lt_cv_objdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -9317,7 +8787,7 @@
 fi
 rmdir .libs 2>/dev/null
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
 $as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
@@ -9410,9 +8880,9 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -9463,10 +8933,10 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9476,9 +8946,9 @@
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:$LINENO: checking for file" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -9529,10 +8999,10 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
 $as_echo "$MAGIC_CMD" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -9613,9 +9083,9 @@
 if test "$GCC" = yes; then
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -9631,11 +9101,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9634: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9104: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9638: \$? = $ac_status" >&5
+   echo "$as_me:9108: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9648,7 +9118,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
@@ -9668,7 +9138,7 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
 $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
@@ -9940,7 +9410,7 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
 $as_echo "$lt_prog_compiler_pic" >&6; }
 
 
@@ -9952,9 +9422,9 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -9970,11 +9440,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9973: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9443: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9977: \$? = $ac_status" >&5
+   echo "$as_me:9447: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9987,7 +9457,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
 $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
@@ -10011,9 +9481,9 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -10039,7 +9509,7 @@
    LDFLAGS="$save_LDFLAGS"
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
 $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
@@ -10054,9 +9524,9 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -10075,11 +9545,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10078: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9548: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10082: \$? = $ac_status" >&5
+   echo "$as_me:9552: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10101,7 +9571,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -10109,9 +9579,9 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -10130,11 +9600,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10133: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9603: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10137: \$? = $ac_status" >&5
+   echo "$as_me:9607: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10156,7 +9626,7 @@
    $RM conftest*
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
 $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
@@ -10165,7 +9635,7 @@
 hard_links="nottested"
 if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
 $as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $RM conftest*
@@ -10173,10 +9643,10 @@
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
 $as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -10189,7 +9659,7 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
@@ -10631,11 +10101,7 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10646,27 +10112,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -10680,16 +10126,9 @@
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10702,11 +10141,7 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10717,27 +10152,7 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
 
 lt_aix_libpath_sed='
     /Import File Strings/,/^$/ {
@@ -10751,16 +10166,9 @@
 if test -z "$aix_libpath"; then
   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 fi
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -10972,42 +10380,16 @@
 	# implicitly export all symbols.
         save_LDFLAGS="$LDFLAGS"
         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat >conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 int foo(void) {}
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
 
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
         LDFLAGS="$save_LDFLAGS"
       else
 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
@@ -11263,7 +10645,7 @@
     fi
   fi
 
-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
 $as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
@@ -11300,16 +10682,16 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
       $RM conftest*
       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
         libobjs=conftest.$ac_objext
@@ -11323,11 +10705,11 @@
         libname=conftest
         lt_save_allow_undefined_flag=$allow_undefined_flag
         allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
         else
@@ -11338,7 +10720,7 @@
         cat conftest.err 1>&5
       fi
       $RM conftest*
-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
 $as_echo "$archive_cmds_need_lc" >&6; }
       ;;
     esac
@@ -11502,7 +10884,7 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
 if test "$GCC" = yes; then
@@ -11924,11 +11306,7 @@
   save_libdir=$libdir
   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -11939,41 +11317,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
+if ac_fn_c_try_link "$LINENO"; then :
+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
   shlibpath_overrides_runpath=yes
 fi
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
   LDFLAGS=$save_LDFLAGS
   libdir=$save_libdir
 
@@ -12185,7 +11535,7 @@
   dynamic_linker=no
   ;;
 esac
-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
 $as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
@@ -12287,7 +11637,7 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" ||
@@ -12312,7 +11662,7 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
 $as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink ||
@@ -12357,18 +11707,14 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+    { $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 test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12386,43 +11732,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $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" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -12435,106 +11756,18 @@
     ;;
 
   *)
-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
-$as_echo_n "checking for shl_load... " >&6; }
-if test "${ac_cv_func_shl_load+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shl_load || defined __stub___shl_load
-choke me
-#endif
-
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shl_load=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
   lt_cv_dlopen="shl_load"
 else
-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+  { $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 test "${ac_cv_lib_dld_shl_load+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12552,145 +11785,32 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+{ $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" = x""yes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_dlopen || defined __stub___dlopen
-choke me
-#endif
-
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_dlopen=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_dlopen=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
   lt_cv_dlopen="dlopen"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+  { $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 test "${ac_cv_lib_dl_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12708,57 +11828,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+{ $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" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+  { $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 test "${ac_cv_lib_svld_dlopen+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12776,57 +11867,28 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_svld_dlopen=no
+  ac_cv_lib_svld_dlopen=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+{ $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" = x""yes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
+  { $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 test "${ac_cv_lib_dld_dld_link+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -12844,43 +11906,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dld_dld_link=no
+  ac_cv_lib_dld_dld_link=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+{ $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" = x""yes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -12919,9 +11956,9 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then
+if test "${lt_cv_dlopen_self+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -12930,7 +11967,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12933 "configure"
+#line 11970 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12989,11 +12026,11 @@
   return status;
 }
 _LT_EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -13010,14 +12047,14 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
 $as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then
+if test "${lt_cv_dlopen_self_static+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -13026,7 +12063,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13029 "configure"
+#line 12066 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13085,11 +12122,11 @@
   return status;
 }
 _LT_EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
@@ -13106,7 +12143,7 @@
 
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
 $as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
@@ -13145,12 +12182,12 @@
 
 striplib=
 old_striplib=
-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
 if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
@@ -13159,15 +12196,15 @@
     if test -n "$STRIP" ; then
       striplib="$STRIP -x"
       old_striplib="$STRIP -S"
-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
     else
-      { $as_echo "$as_me:$LINENO: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
     ;;
   *)
-    { $as_echo "$as_me:$LINENO: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     ;;
   esac
@@ -13185,12 +12222,12 @@
 
 
   # Report which library types will actually be built
-  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
 $as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
 $as_echo "$can_build_shared" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
 $as_echo_n "checking whether to build shared libraries... " >&6; }
   test "$can_build_shared" = "no" && enable_shared=no
 
@@ -13211,14 +12248,14 @@
     fi
     ;;
   esac
-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
 $as_echo "$enable_shared" >&6; }
 
-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
 $as_echo_n "checking whether to build static libraries... " >&6; }
   # Make sure either enable_shared or enable_static is yes.
   test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
 $as_echo "$enable_static" >&6; }
 
 
@@ -13259,9 +12296,9 @@
 	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:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -13274,14 +12311,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -13289,10 +12326,10 @@
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
 $as_echo "$PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -13302,9 +12339,9 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -13317,14 +12354,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -13332,10 +12369,10 @@
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
 $as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -13344,7 +12381,7 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
@@ -13357,13 +12394,13 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else
-		{ $as_echo "$as_me:$LINENO: result: no" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
@@ -13372,13 +12409,13 @@
 
 GNOME_PLATFORM=2
 GNOME_MINOR=30
-GNOME_MICRO=0
+GNOME_MICRO=2
 GNOME_DISTRIBUTOR="GNOME.Org"
 GNOME_DATE=`date +"%Y-%m-%d"`
 
 
 # Check whether --with-gnome_distributor was given.
-if test "${with_gnome_distributor+set}" = set; then
+if test "${with_gnome_distributor+set}" = set; then :
   withval=$with_gnome_distributor;
 fi
 
@@ -13388,7 +12425,7 @@
 fi
 
 # Check whether --enable-date-in-gnome-version was given.
-if test "${enable_date_in_gnome_version+set}" = set; then
+if test "${enable_date_in_gnome_version+set}" = set; then :
   enableval=$enable_date_in_gnome_version;
 else
   enable_date_in_gnome_version=yes
@@ -13423,7 +12460,7 @@
 
 
 	# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
 else
   enable_debug=no
@@ -13432,16 +12469,14 @@
 
 	if test x$enable_debug = xyes ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define GNOME_ENABLE_DEBUG 1
-_ACEOF
+$as_echo "#define GNOME_ENABLE_DEBUG 1" >>confdefs.h
 
 	fi
 
 
 
     # Check whether --enable-compile-warnings was given.
-if test "${enable_compile_warnings+set}" = set; then
+if test "${enable_compile_warnings+set}" = set; then :
   enableval=$enable_compile_warnings;
 else
   enable_compile_warnings="maximum"
@@ -13472,13 +12507,9 @@
 	for option in -Wno-sign-compare; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
-		{ $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gcc understands $option" >&5
 $as_echo_n "checking whether gcc understands $option... " >&6; }
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -13489,35 +12520,14 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
+if ac_fn_c_try_compile "$LINENO"; then :
   has_option=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	has_option=no
+  has_option=no
 fi
-
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$SAVE_CFLAGS"
-		{ $as_echo "$as_me:$LINENO: result: $has_option" >&5
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $has_option" >&5
 $as_echo "$has_option" >&6; }
 		if test $has_option = yes; then
 		  warning_flags="$warning_flags $option"
@@ -13531,26 +12541,24 @@
 	fi
 	;;
     *)
-	{ { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5
-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
 	;;
     esac
     CFLAGS="$realsave_CFLAGS"
-    { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
 $as_echo_n "checking what warning flags to pass to the C compiler... " >&6; }
-    { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $warning_flags" >&5
 $as_echo "$warning_flags" >&6; }
 
     # Check whether --enable-iso-c was given.
-if test "${enable_iso_c+set}" = set; then
+if test "${enable_iso_c+set}" = set; then :
   enableval=$enable_iso_c;
 else
   enable_iso_c=no
 fi
 
 
-    { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking what language compliance flags to pass to the C compiler" >&5
 $as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
     complCFLAGS=
     if test "x$enable_iso_c" != "xno"; then
@@ -13565,7 +12573,7 @@
 	esac
 	fi
     fi
-    { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $complCFLAGS" >&5
 $as_echo "$complCFLAGS" >&6; }
 
     WARN_CFLAGS="$warning_flags $complCFLAGS"
@@ -13588,7 +12596,7 @@
 # As a special favour for vuntz, support --disable-deprecations
 
 # Check whether --enable-deprecations was given.
-if test "${enable_deprecations+set}" = set; then
+if test "${enable_deprecations+set}" = set; then :
   enableval=$enable_deprecations;
 else
   enable_deprecations=yes
@@ -13604,7 +12612,7 @@
 
 
 # Check whether --with-pnp-ids-path was given.
-if test "${with_pnp_ids_path+set}" = set; then
+if test "${with_pnp_ids_path+set}" = set; then :
   withval=$with_pnp_ids_path;
 else
   with_pnp_ids_path="\${pnpdatadir}/pnp.ids"
@@ -13642,20 +12650,18 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for libstartup-notification" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libstartup-notification" >&5
 $as_echo_n "checking for libstartup-notification... " >&6; }
 if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_REQUIRED libstartup-notification-1.0; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STARTUP_NOTIFICATION 1
-_ACEOF
+$as_echo "#define HAVE_STARTUP_NOTIFICATION 1" >>confdefs.h
 
   have_startup_notification=yes
   STARTUP_NOTIFICATION_PACKAGE=libstartup-notification-1.0
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   have_startup_notification=no
   STARTUP_NOTIFICATION_PACKAGE=
@@ -13664,12 +12670,12 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for X" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
 $as_echo_n "checking for X... " >&6; }
 
 
 # Check whether --with-x was given.
-if test "${with_x+set}" = set; then
+if test "${with_x+set}" = set; then :
   withval=$with_x;
 fi
 
@@ -13679,10 +12685,8 @@
   have_x=disabled
 else
   case $x_includes,$x_libraries in #(
-    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
-   { (exit 1); exit 1; }; };; #(
-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
+    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
@@ -13730,21 +12734,25 @@
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
@@ -13766,37 +12774,14 @@
 if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
@@ -13804,7 +12789,6 @@
   fi
 done
 fi
-
 rm -f conftest.err conftest.$ac_ext
 fi # $ac_x_includes = no
 
@@ -13814,11 +12798,7 @@
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lX11 $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
@@ -13829,35 +12809,12 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	LIBS=$ac_save_LIBS
+  LIBS=$ac_save_LIBS
 for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
@@ -13869,10 +12826,8 @@
   done
 done
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
 case $ac_x_includes,$ac_x_libraries in #(
@@ -13893,7 +12848,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
 $as_echo "$have_x" >&6; }
   no_x=yes
 else
@@ -13904,24 +12859,24 @@
   ac_cv_have_x="have_x=yes\
 	ac_x_includes='$x_includes'\
 	ac_x_libraries='$x_libraries'"
-  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
 $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for XLIB" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5
 $as_echo_n "checking for XLIB... " >&6; }
 
 if test -n "$XLIB_CFLAGS"; then
     pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XLIB_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
 else
   pkg_failed=yes
@@ -13933,11 +12888,11 @@
     pkg_cv_XLIB_LIBS="$XLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_XLIB_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
 else
   pkg_failed=yes
@@ -13963,15 +12918,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$XLIB_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
                 X11_PACKAGE=
      if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
@@ -13984,16 +12937,12 @@
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
 $as_echo_n "checking whether -R must be followed by a space... " >&6; }
     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
     ac_xsave_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14004,40 +12953,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        X_LIBS="$X_LIBS -R$x_libraries"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14048,46 +12970,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	  X_LIBS="$X_LIBS -R $x_libraries"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
 $as_echo "neither works" >&6; }
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     ac_c_werror_flag=$ac_xsave_c_werror_flag
     LIBS=$ac_xsave_LIBS
   fi
@@ -14103,11 +12998,7 @@
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14125,44 +13016,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
-	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14180,59 +13044,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_dnet_ntoa=no
+  ac_cv_lib_dnet_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14250,52 +13085,25 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_stub_dnet_ntoa=no
+  ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -14306,105 +13114,20 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
-$as_echo_n "checking for gethostbyname... " >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostbyname
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_gethostbyname=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_gethostbyname=no
-fi
+    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
 
     if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14422,59 +13145,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyname=no
+  ac_cv_lib_nsl_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14492,43 +13186,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bsd_gethostbyname=no
+  ac_cv_lib_bsd_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -14542,33 +13211,21 @@
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
+    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
+
+fi
+
+    if test $ac_cv_func_connect = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+$as_echo_n "checking for connect in -lsocket... " >&6; }
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef connect
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -14577,13 +13234,6 @@
 extern "C"
 #endif
 char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-
 int
 main ()
 {
@@ -14592,55 +13242,38 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_socket_connect=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_connect=no
+  ac_cv_lib_socket_connect=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+$as_echo "$ac_cv_lib_socket_connect" >&6; }
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+fi
+
+    fi
+
+    # Guillermo Gomez says -lposix is necessary on A/UX.
+    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
 
-    if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-$as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
+    if test $ac_cv_func_remove = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lposix  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14649,316 +13282,47 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char connect ();
+char remove ();
 int
 main ()
 {
-return connect ();
+return remove ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_socket_connect=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_posix_remove=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_connect=no
+  ac_cv_lib_posix_remove=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-$as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
-
-int
-main ()
-{
-return remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_remove=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_remove=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
-
-    if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char remove ();
-int
-main ()
-{
-return remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_posix_remove=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_posix_remove=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shmat
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shmat=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shmat=no
-fi
+    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
 
     if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
 $as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -14976,43 +13340,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ipc_shmat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ipc_shmat=no
+  ac_cv_lib_ipc_shmat=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
 $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
@@ -15028,18 +13367,14 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15057,43 +13392,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ICE_IceConnectionNumber=no
+  ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -15102,9 +13412,7 @@
 fi
 
      if test "x$no_x" = xyes; then
-       { { $as_echo "$as_me:$LINENO: error: \"no (requires X development libraries)\"" >&5
-$as_echo "$as_me: error: \"no (requires X development libraries)\"" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "\"no (requires X development libraries)\"" "$LINENO" 5
      else
        XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
        XLIB_CFLAGS=$X_CFLAGS
@@ -15114,9 +13422,7 @@
      if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
 
-cat >>confdefs.h <<\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
+$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
 
   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
 else
@@ -15129,16 +13435,12 @@
     X_LIBS="$X_LIBS -L$x_libraries"
     # For Solaris; some versions of Sun CC require a space after -R and
     # others require no space.  Words are not sufficient . . . .
-    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
 $as_echo_n "checking whether -R must be followed by a space... " >&6; }
     ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
     ac_xsave_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15149,40 +13451,13 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
        X_LIBS="$X_LIBS -R$x_libraries"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -15193,46 +13468,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	  X_LIBS="$X_LIBS -R $x_libraries"
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
 $as_echo "neither works" >&6; }
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     ac_c_werror_flag=$ac_xsave_c_werror_flag
     LIBS=$ac_xsave_LIBS
   fi
@@ -15248,11 +13496,7 @@
     # libraries were built with DECnet support.  And Karl Berry says
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15270,44 +13514,17 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  :
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+if ac_fn_c_try_link "$LINENO"; then :
 
-	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15325,59 +13542,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_dnet_ntoa=no
+  ac_cv_lib_dnet_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15395,52 +13583,25 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_dnet_stub_dnet_ntoa=no
+  ac_cv_lib_dnet_stub_dnet_ntoa=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
+if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
 fi
 
     fi
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     LIBS="$ac_xsave_LIBS"
 
     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
@@ -15451,105 +13612,20 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
-$as_echo_n "checking for gethostbyname... " >&6; }
-if test "${ac_cv_func_gethostbyname+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef gethostbyname
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_gethostbyname=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
+    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
+if test "x$ac_cv_func_gethostbyname" = x""yes; then :
 
-	ac_cv_func_gethostbyname=no
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
-$as_echo "$ac_cv_func_gethostbyname" >&6; }
-
     if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15567,59 +13643,30 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_nsl_gethostbyname=no
+  ac_cv_lib_nsl_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15637,43 +13684,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_gethostbyname=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_bsd_gethostbyname=no
+  ac_cv_lib_bsd_gethostbyname=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
+if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
 fi
 
@@ -15687,105 +13709,20 @@
     # variants that don't use the name server (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    { $as_echo "$as_me:$LINENO: checking for connect" >&5
-$as_echo_n "checking for connect... " >&6; }
-if test "${ac_cv_func_connect+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef connect
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_connect=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_connect=no
-fi
+    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
+if test "x$ac_cv_func_connect" = x""yes; then :
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-$as_echo "$ac_cv_func_connect" >&6; }
 
     if test $ac_cv_func_connect = no; then
-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
 $as_echo_n "checking for connect in -lsocket... " >&6; }
-if test "${ac_cv_lib_socket_connect+set}" = set; then
+if test "${ac_cv_lib_socket_connect+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15803,76 +13740,39 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_connect=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_socket_connect=no
+  ac_cv_lib_socket_connect=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
 $as_echo "$ac_cv_lib_socket_connect" >&6; }
-if test "x$ac_cv_lib_socket_connect" = x""yes; then
+if test "x$ac_cv_lib_socket_connect" = x""yes; then :
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
 fi
 
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    { $as_echo "$as_me:$LINENO: checking for remove" >&5
-$as_echo_n "checking for remove... " >&6; }
-if test "${ac_cv_func_remove+set}" = set; then
+    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
+if test "x$ac_cv_func_remove" = x""yes; then :
+
+fi
+
+    if test $ac_cv_func_remove = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+$as_echo_n "checking for remove in -lposix... " >&6; }
+if test "${ac_cv_lib_posix_remove+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lposix  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef remove
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
@@ -15881,13 +13781,6 @@
 extern "C"
 #endif
 char remove ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
-
 int
 main ()
 {
@@ -15896,55 +13789,38 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_posix_remove=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_remove=no
+  ac_cv_lib_posix_remove=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+$as_echo "$ac_cv_lib_posix_remove" >&6; }
+if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 fi
 
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+    fi
+
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
+if test "x$ac_cv_func_shmat" = x""yes; then :
+
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
-$as_echo "$ac_cv_func_remove" >&6; }
 
-    if test $ac_cv_func_remove = no; then
-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-$as_echo_n "checking for remove in -lposix... " >&6; }
-if test "${ac_cv_lib_posix_remove+set}" = set; then
+    if test $ac_cv_func_shmat = no; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+$as_echo_n "checking for shmat in -lipc... " >&6; }
+if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lposix  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+LIBS="-lipc  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -15953,216 +13829,32 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char remove ();
+char shmat ();
 int
 main ()
 {
-return remove ();
+return shmat ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_posix_remove=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_ipc_shmat=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_posix_remove=no
+  ac_cv_lib_ipc_shmat=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-$as_echo "$ac_cv_lib_posix_remove" >&6; }
-if test "x$ac_cv_lib_posix_remove" = x""yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 fi
 
     fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
-$as_echo_n "checking for shmat... " >&6; }
-if test "${ac_cv_func_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shmat
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shmat=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_shmat=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
-$as_echo "$ac_cv_func_shmat" >&6; }
-
-    if test $ac_cv_func_shmat = no; then
-      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-$as_echo_n "checking for shmat in -lipc... " >&6; }
-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lipc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shmat ();
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_ipc_shmat=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ipc_shmat=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-$as_echo "$ac_cv_lib_ipc_shmat" >&6; }
-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-fi
-
-    fi
-  fi
+  fi
 
   # Check for libraries that X11R6 Xt/Xaw programs need.
   ac_save_LDFLAGS=$LDFLAGS
@@ -16173,18 +13865,14 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -16202,43 +13890,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_ICE_IceConnectionNumber=no
+  ac_cv_lib_ICE_IceConnectionNumber=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
+if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 fi
 
@@ -16247,9 +13910,7 @@
 fi
 
      if test "x$no_x" = xyes; then
-       { { $as_echo "$as_me:$LINENO: error: \"no (requires X development libraries)\"" >&5
-$as_echo "$as_me: error: \"no (requires X development libraries)\"" >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "\"no (requires X development libraries)\"" "$LINENO" 5
      else
        XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
        XLIB_CFLAGS=$X_CFLAGS
@@ -16257,7 +13918,7 @@
 else
 	XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS
 	XLIB_LIBS=$pkg_cv_XLIB_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	X11_PACKAGE=x11
 fi
@@ -16266,20 +13927,18 @@
 
 
 
-{ $as_echo "$as_me:$LINENO: checking for xrandr" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrandr" >&5
 $as_echo_n "checking for xrandr... " >&6; }
 if $PKG_CONFIG --atleast-version $XRANDR_REQUIRED xrandr; then
-  { $as_echo "$as_me:$LINENO: result: yes" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_RANDR 1
-_ACEOF
+$as_echo "#define HAVE_RANDR 1" >>confdefs.h
 
   have_randr=yes
   RANDR_PACKAGE=xrandr
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
   have_randr=no
   RANDR_PACKAGE=
@@ -16290,18 +13949,18 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for GNOME_DESKTOP" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_DESKTOP" >&5
 $as_echo_n "checking for GNOME_DESKTOP... " >&6; }
 
 if test -n "$GNOME_DESKTOP_CFLAGS"; then
     pkg_cv_GNOME_DESKTOP_CFLAGS="$GNOME_DESKTOP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED \$STARTUP_NOTIFICATION_PACKAGE \$RANDR_PACKAGE\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED \$STARTUP_NOTIFICATION_PACKAGE \$RANDR_PACKAGE\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GNOME_DESKTOP_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE" 2>/dev/null`
 else
   pkg_failed=yes
@@ -16313,11 +13972,11 @@
     pkg_cv_GNOME_DESKTOP_LIBS="$GNOME_DESKTOP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED \$STARTUP_NOTIFICATION_PACKAGE \$RANDR_PACKAGE\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GDK_PIXBUF_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED gconf-2.0 >= \$GCONF_REQUIRED \$STARTUP_NOTIFICATION_PACKAGE \$RANDR_PACKAGE\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   pkg_cv_GNOME_DESKTOP_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE" 2>/dev/null`
 else
   pkg_failed=yes
@@ -16343,7 +14002,7 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GNOME_DESKTOP_PKG_ERRORS" >&5
 
-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE) were not met:
+	as_fn_error "Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE) were not met:
 
 $GNOME_DESKTOP_PKG_ERRORS
 
@@ -16353,33 +14012,11 @@
 Alternatively, you may set the environment variables GNOME_DESKTOP_CFLAGS
 and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
-" >&5
-$as_echo "$as_me: error: Package requirements (gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED $STARTUP_NOTIFICATION_PACKAGE $RANDR_PACKAGE) were not met:
-
-$GNOME_DESKTOP_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GNOME_DESKTOP_CFLAGS
-and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
-   { (exit 1); exit 1; }; }
+" "$LINENO" 5
 elif test $pkg_failed = untried; then
-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GNOME_DESKTOP_CFLAGS
-and GNOME_DESKTOP_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
@@ -16388,12 +14025,11 @@
 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." >&2;}
-   { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
 else
 	GNOME_DESKTOP_CFLAGS=$pkg_cv_GNOME_DESKTOP_CFLAGS
 	GNOME_DESKTOP_LIBS=$pkg_cv_GNOME_DESKTOP_LIBS
-        { $as_echo "$as_me:$LINENO: result: yes" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 fi
@@ -16408,9 +14044,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_PYTHON+set}" = set; then
+if test "${ac_cv_path_PYTHON+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
@@ -16423,14 +14059,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -16438,10 +14074,10 @@
 fi
 PYTHON=$ac_cv_path_PYTHON
 if test -n "$PYTHON"; then
-  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5
 $as_echo "$PYTHON" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -16455,20 +14091,18 @@
 
 
   if test "$PYTHON" = :; then
-      { { $as_echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5
-$as_echo "$as_me: error: no suitable Python interpreter found" >&2;}
-   { (exit 1); exit 1; }; }
+      as_fn_error "no suitable Python interpreter found" "$LINENO" 5
   else
 
 
-  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5
 $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
-if test "${am_cv_python_version+set}" = set; then
+if test "${am_cv_python_version+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_version" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
 $as_echo "$am_cv_python_version" >&6; }
   PYTHON_VERSION=$am_cv_python_version
 
@@ -16480,23 +14114,23 @@
 
 
 
-  { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5
 $as_echo_n "checking for $am_display_PYTHON platform... " >&6; }
-if test "${am_cv_python_platform+set}" = set; then
+if test "${am_cv_python_platform+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5
 $as_echo "$am_cv_python_platform" >&6; }
   PYTHON_PLATFORM=$am_cv_python_platform
 
 
 
 
-                { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5
 $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; }
-if test "${am_cv_python_pythondir+set}" = set; then
+if test "${am_cv_python_pythondir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$prefix" = xNONE
@@ -16512,10 +14146,18 @@
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
        am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
        ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
      esac
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5
 $as_echo "$am_cv_python_pythondir" >&6; }
   pythondir=$am_cv_python_pythondir
 
@@ -16524,9 +14166,9 @@
   pkgpythondir=\${pythondir}/$PACKAGE
 
 
-            { $as_echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5
 $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; }
-if test "${am_cv_python_pyexecdir+set}" = set; then
+if test "${am_cv_python_pyexecdir+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$exec_prefix" = xNONE
@@ -16542,10 +14184,18 @@
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
        am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
        ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
      esac
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5
 $as_echo "$am_cv_python_pyexecdir" >&6; }
   pyexecdir=$am_cv_python_pyexecdir
 
@@ -16563,35 +14213,33 @@
 
 gdu_cv_version_required=0.3.2
 
-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
 $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
 if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   gdu_cv_have_gdu=yes
 else
   gdu_cv_have_gdu=no
 fi
 
 if test "$gdu_cv_have_gdu" = "yes"; then
-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	:
 else
-	{ $as_echo "$as_me:$LINENO: result: no" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
-   { (exit 1); exit 1; }; }
+	as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
 fi
 
 
 
 # Check whether --with-help-dir was given.
-if test "${with_help_dir+set}" = set; then
+if test "${with_help_dir+set}" = set; then :
   withval=$with_help_dir;
 else
   with_help_dir='${datadir}/gnome/help'
@@ -16602,7 +14250,7 @@
 
 
 # Check whether --with-omf-dir was given.
-if test "${with_omf_dir+set}" = set; then
+if test "${with_omf_dir+set}" = set; then :
   withval=$with_omf_dir;
 else
   with_omf_dir='${datadir}/omf'
@@ -16613,7 +14261,7 @@
 
 
 # Check whether --with-help-formats was given.
-if test "${with_help_formats+set}" = set; then
+if test "${with_help_formats+set}" = set; then :
   withval=$with_help_formats;
 else
   with_help_formats=''
@@ -16623,7 +14271,7 @@
 
 
 # Check whether --enable-scrollkeeper was given.
-if test "${enable_scrollkeeper+set}" = set; then
+if test "${enable_scrollkeeper+set}" = set; then :
   enableval=$enable_scrollkeeper;
 else
   enable_scrollkeeper=yes
@@ -16662,151 +14310,12 @@
 
 
 
-
-for ac_header in locale.h
-do
-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
-$as_echo_n "checking $ac_header usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
-$as_echo_n "checking $ac_header presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop ##
-## ---------------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-$as_echo_n "checking for $ac_header... " >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-ac_res=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-
-fi
-as_val=`eval 'as_val=${'$as_ac_Header'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+   for ac_header in locale.h
+do :
+  ac_fn_c_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 :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_LOCALE_H 1
 _ACEOF
 
 fi
@@ -16814,16 +14323,12 @@
 done
 
     if test $ac_cv_header_locale_h = yes; then
-    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
+    { $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 test "${am_cv_val_LC_MESSAGES+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <locale.h>
 int
@@ -16834,46 +14339,19 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   am_cv_val_LC_MESSAGES=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	am_cv_val_LC_MESSAGES=no
+  am_cv_val_LC_MESSAGES=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
 $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
     if test $am_cv_val_LC_MESSAGES = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
 
     fi
   fi
@@ -16886,155 +14364,20 @@
     XGETTEXT=:
     INTLLIBS=
 
-    if test "${ac_cv_header_libintl_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
-$as_echo_n "checking libintl.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <libintl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
-$as_echo_n "checking libintl.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <libintl.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------------- ##
-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop ##
-## ---------------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_libintl_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-
-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
+    ac_fn_c_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 :
   gt_cv_func_dgettext_libintl="no"
       libintl_extra_libs=""
 
       #
       # First check in libc
       #
-      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+      { $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 test "${gt_cv_func_ngettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -17047,54 +14390,25 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_ngettext_libc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_ngettext_libc=no
+  gt_cv_func_ngettext_libc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
 $as_echo "$gt_cv_func_ngettext_libc" >&6; }
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+	      { $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 test "${gt_cv_func_dgettext_libc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <libintl.h>
@@ -17107,141 +14421,26 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   gt_cv_func_dgettext_libc=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	gt_cv_func_dgettext_libc=no
+  gt_cv_func_dgettext_libc=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
 $as_echo "$gt_cv_func_dgettext_libc" >&6; }
       fi
 
       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+        for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
 
 fi
@@ -17256,18 +14455,14 @@
 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
 
-        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
+        { $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 test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17278,62 +14473,33 @@
 #endif
 char bindtextdomain ();
 int
-main ()
-{
-return bindtextdomain ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+main ()
+{
+return bindtextdomain ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_bindtextdomain=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_bindtextdomain=no
+  ac_cv_lib_intl_bindtextdomain=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
+{ $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
-  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; 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 test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17351,55 +14517,26 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_ngettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_ngettext=no
+  ac_cv_lib_intl_ngettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $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
-  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; 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 test "${ac_cv_lib_intl_dgettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17417,43 +14554,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_dgettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_dgettext=no
+  ac_cv_lib_intl_dgettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
+{ $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" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 fi
 
@@ -17463,22 +14575,18 @@
 
 
 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-	  { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-	  { $as_echo "$as_me:$LINENO: result: " >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
 $as_echo "" >&6; }
-  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
+  	  { $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 test "${ac_cv_lib_intl_ngettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17496,55 +14604,26 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_ngettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_ngettext=no
+  ac_cv_lib_intl_ngettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
+{ $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
-  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
+if test "x$ac_cv_lib_intl_ngettext" = x""yes; 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 test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl -liconv $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
@@ -17562,43 +14641,18 @@
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_dcgettext=yes
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_lib_intl_dcgettext=no
+  ac_cv_lib_intl_dcgettext=no
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
+{ $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" = x""yes; then :
   gt_cv_func_dgettext_libintl=yes
 			libintl_extra_libs=-liconv
 else
@@ -17620,102 +14674,12 @@
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS -lintl $libintl_extra_libs"
           unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+          for ac_func in bind_textdomain_codeset
+do :
+  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
 _ACEOF
 
 fi
@@ -17745,15 +14709,13 @@
 
       if test "$gt_cv_have_gettext" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_GETTEXT 1
-_ACEOF
+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
 
 	# Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_MSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$MSGFMT" in
@@ -17778,118 +14740,28 @@
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != "no"; then
-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
 $as_echo "$MSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 	if test "$MSGFMT" != "no"; then
           glib_save_LIBS="$LIBS"
           LIBS="$LIBS $INTLLIBS"
-
-for ac_func in dcgettext
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-$as_echo_n "checking for $ac_func... " >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  eval "$as_ac_var=yes"
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	eval "$as_ac_var=no"
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-as_val=`eval 'as_val=${'$as_ac_var'}
-		 $as_echo "$as_val"'`
-   if test "x$as_val" = x""yes; then
+	  for ac_func in dcgettext
+do :
+  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
+if test "x$ac_cv_func_dcgettext" = x""yes; then :
   cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define HAVE_DCGETTEXT 1
 _ACEOF
 
 fi
 done
 
 	  MSGFMT_OPTS=
-	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
 $as_echo_n "checking if msgfmt accepts -c... " >&6; }
 	  cat >conftest.foo <<_ACEOF
 
@@ -17904,14 +14776,14 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 _ACEOF
-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
+if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-else { $as_echo "$as_me:$LINENO: result: no" >&5
+else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 echo "$as_me: failed input was:" >&5
 sed 's/^/| /' conftest.foo >&5
@@ -17919,9 +14791,9 @@
 
 	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_GMSGFMT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GMSGFMT in
@@ -17934,14 +14806,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
@@ -17950,19 +14822,19 @@
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
 $as_echo "$GMSGFMT" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
 	  # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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 test "${ac_cv_path_XGETTEXT+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case "$XGETTEXT" in
@@ -17987,144 +14859,33 @@
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
 $as_echo "$XGETTEXT" >&6; }
-else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-	  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-extern int _nl_msg_cat_cntr;
-			 return _nl_msg_cat_cntr
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  CATOBJEXT=.gmo
-             DATADIRNAME=share
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	case $host in
-	    *-*-solaris*)
-	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char bind_textdomain_codeset (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef bind_textdomain_codeset
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char bind_textdomain_codeset ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
 int
 main ()
 {
-return bind_textdomain_codeset ();
+extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_bind_textdomain_codeset=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  CATOBJEXT=.gmo
+             DATADIRNAME=share
 else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_func_bind_textdomain_codeset=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+  case $host in
+	    *-*-solaris*)
+	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
   CATOBJEXT=.gmo
                DATADIRNAME=share
 else
@@ -18139,10 +14900,8 @@
 	    ;;
 	    esac
 fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
           LIBS="$glib_save_LIBS"
 	  INSTOBJEXT=.mo
 	else
@@ -18156,9 +14915,7 @@
 
     if test "$gt_cv_have_gettext" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define ENABLE_NLS 1
-_ACEOF
+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
 
     fi
 
@@ -18166,7 +14923,7 @@
                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
         : ;
       else
-        { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
         XGETTEXT=":"
       fi
@@ -18199,7 +14956,7 @@
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
 $as_echo_n "checking for catalogs to be installed... " >&6; }
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -18224,7 +14981,7 @@
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
 $as_echo "$LINGUAS" >&6; }
      fi
 
@@ -18262,9 +15019,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_AWK+set}" = set; then
+if test "${ac_cv_path_AWK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $AWK in
@@ -18277,14 +15034,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -18292,10 +15049,10 @@
 fi
 AWK=$ac_cv_path_AWK
 if test -n "$AWK"; then
-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
 $as_echo "$AWK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18307,9 +15064,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_PERL+set}" = set; then
+if test "${ac_cv_path_PERL+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $PERL in
@@ -18322,14 +15079,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -18337,10 +15094,10 @@
 fi
 PERL=$ac_cv_path_PERL
 if test -n "$PERL"; then
-  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
 $as_echo "$PERL" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18350,7 +15107,7 @@
 
 
 # Check whether --enable-rebuilds was given.
-if test "${enable_rebuilds+set}" = set; then
+if test "${enable_rebuilds+set}" = set; then :
   enableval=$enable_rebuilds;
 else
   enable_rebuilds=yes
@@ -18370,9 +15127,9 @@
 
     # Extract the first word of "gtkdoc-check", so it can be a program name with args.
 set dummy gtkdoc-check; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_GTKDOC_CHECK+set}" = set; then
+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GTKDOC_CHECK in
@@ -18385,14 +15142,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -18400,10 +15157,10 @@
 fi
 GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
 if test -n "$GTKDOC_CHECK"; then
-  { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
 $as_echo "$GTKDOC_CHECK" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18412,9 +15169,9 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_GTKDOC_REBASE+set}" = set; then
+if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GTKDOC_REBASE in
@@ -18427,14 +15184,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -18442,10 +15199,10 @@
 fi
 GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
 if test -n "$GTKDOC_REBASE"; then
-  { $as_echo "$as_me:$LINENO: result: $GTKDOC_REBASE" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
 $as_echo "$GTKDOC_REBASE" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18456,9 +15213,9 @@
 
   # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
 set dummy gtkdoc-mkpdf; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $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_GTKDOC_MKPDF+set}" = set; then
+if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else
   case $GTKDOC_MKPDF in
@@ -18471,14 +15228,14 @@
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
     ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
 IFS=$as_save_IFS
 
   ;;
@@ -18486,10 +15243,10 @@
 fi
 GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
 if test -n "$GTKDOC_MKPDF"; then
-  { $as_echo "$as_me:$LINENO: result: $GTKDOC_MKPDF" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
 $as_echo "$GTKDOC_MKPDF" >&6; }
 else
-  { $as_echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
@@ -18497,7 +15254,7 @@
 
 
 # Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then
+if test "${with_html_dir+set}" = set; then :
   withval=$with_html_dir;
 else
   with_html_dir='${datadir}/gtk-doc/html'
@@ -18507,7 +15264,7 @@
 
 
     # Check whether --enable-gtk-doc was given.
-if test "${enable_gtk_doc+set}" = set; then
+if test "${enable_gtk_doc+set}" = set; then :
   enableval=$enable_gtk_doc;
 else
   enable_gtk_doc=no
@@ -18516,33 +15273,31 @@
 
   if test x$enable_gtk_doc = xyes; then
     if test -n "$PKG_CONFIG" && \
-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\"") >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.4") 2>&5
   ac_status=$?
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
   :
 else
-  { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" >&5
-$as_echo "$as_me: error: You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "You need to have gtk-doc >= 1.4 installed to build $PACKAGE_NAME" "$LINENO" 5
 fi
   fi
 
-  { $as_echo "$as_me:$LINENO: checking whether to build gtk-doc documentation" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
 $as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
-  { $as_echo "$as_me:$LINENO: result: $enable_gtk_doc" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
 $as_echo "$enable_gtk_doc" >&6; }
 
     # Check whether --enable-gtk-doc-html was given.
-if test "${enable_gtk_doc_html+set}" = set; then
+if test "${enable_gtk_doc_html+set}" = set; then :
   enableval=$enable_gtk_doc_html;
 else
   enable_gtk_doc_html=yes
 fi
 
     # Check whether --enable-gtk-doc-pdf was given.
-if test "${enable_gtk_doc_pdf+set}" = set; then
+if test "${enable_gtk_doc_pdf+set}" = set; then :
   enableval=$enable_gtk_doc_pdf;
 else
   enable_gtk_doc_pdf=no
@@ -18626,13 +15381,13 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) $as_unset $ac_var ;;
+      *) { eval $ac_var=; unset $ac_var;} ;;
       esac ;;
     esac
   done
@@ -18640,8 +15395,8 @@
   (set) 2>&1 |
     case $as_nl`(ac_space=' '; set) 2>&1` in #(
     *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
@@ -18664,11 +15419,11 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" != "x/dev/null" &&
-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+      { $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
   else
-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+    { $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;}
   fi
 fi
@@ -18688,8 +15443,8 @@
   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
@@ -18705,101 +15460,66 @@
 fi
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
   ac_config_commands="$ac_config_commands po/stamp-it"
 
 
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${USE_INTERNAL_PNP_IDS_TRUE}" && test -z "${USE_INTERNAL_PNP_IDS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"USE_INTERNAL_PNP_IDS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"USE_INTERNAL_PNP_IDS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"USE_INTERNAL_PNP_IDS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ENABLE_SK\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_HTML\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_BUILD_PDF\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
-  { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-$as_echo "$as_me: error: conditional \"GTK_DOC_USE_REBASE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -18809,17 +15529,18 @@
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
@@ -18827,23 +15548,15 @@
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
 else
-  case `(set -o) 2>/dev/null` in
-  *posix*) set -o posix ;;
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
 esac
-
 fi
 
 
-
-
-# PATH needs CR
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
 as_nl='
 '
 export as_nl
@@ -18851,7 +15564,13 @@
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
   as_echo='printf %s\n'
   as_echo_n='printf %s'
 else
@@ -18862,7 +15581,7 @@
     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
     as_echo_n_body='eval
       arg=$1;
-      case $arg in
+      case $arg in #(
       *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
@@ -18885,13 +15604,6 @@
   }
 fi
 
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
 
 # IFS
 # We need space, tab and new line, in precisely that order.  Quoting is
@@ -18901,15 +15613,15 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
-case $0 in
+case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
 IFS=$as_save_IFS
 
      ;;
@@ -18921,12 +15633,16 @@
 fi
 if test ! -f "$as_myself"; then
   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  { (exit 1); exit 1; }
+  exit 1
 fi
 
-# Work around bugs in pre-3.0 UWIN ksh.
-for as_var in ENV MAIL MAILPATH
-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
 done
 PS1='$ '
 PS2='> '
@@ -18938,7 +15654,89 @@
 LANGUAGE=C
 export LANGUAGE
 
-# Required to use basename.
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error ERROR [LINENO LOG_FD]
+# ---------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with status $?, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$?; test $as_status -eq 0 && as_status=1
+  if test "$3"; then
+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
+  fi
+  $as_echo "$as_me: error: $1" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
@@ -18952,8 +15750,12 @@
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
 as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
@@ -18973,76 +15775,25 @@
 	  }
 	  s/.*/./; q'`
 
-# CDPATH.
-$as_unset CDPATH
-
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line after each line using $LINENO; the second 'sed'
-  # does the real work.  The second script uses 'N' to pair each
-  # line-number line with the line containing $LINENO, and appends
-  # trailing '-' during substitution so that $LINENO is not a special
-  # case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
-  # E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
 
 ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in
+case `echo -n x` in #(((((
 -n*)
-  case `echo 'x\c'` in
+  case `echo 'xy\c'` in
   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  *)   ECHO_C='\c';;
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
   esac;;
 *)
   ECHO_N='-n';;
 esac
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
 
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
@@ -19071,8 +15822,56 @@
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
 
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
@@ -19091,10 +15890,10 @@
       if test -d "$1"; then
 	test -d "$1/.";
       else
-	case $1 in
+	case $1 in #(
 	-*)set "./$1";;
 	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
 	???[sx]*):;;*)false;;esac;fi
     '\'' sh
   '
@@ -19109,13 +15908,19 @@
 
 
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Save the log message, to keep $[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gnome-desktop $as_me 2.30.0, which was
-generated by GNU Autoconf 2.63.  Invocation command line was
+This file was extended by gnome-desktop $as_me 2.30.2, which was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -19147,13 +15952,15 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTION]... [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -19172,16 +15979,17 @@
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gnome-desktop config.status 2.30.0
-configured by $0, generated by GNU Autoconf 2.63,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+gnome-desktop config.status 2.30.2
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -19217,6 +16025,8 @@
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -19224,20 +16034,19 @@
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    { $as_echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; };;
+    as_fn_error "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
     $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
@@ -19245,11 +16054,10 @@
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { $as_echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1"
+  *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
 
   esac
@@ -19583,9 +16391,7 @@
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
 
-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -19612,7 +16418,7 @@
   trap 'exit_status=$?
   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
 ' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  trap 'as_fn_exit 1' 1 2 13 15
 }
 # Create a (secure) tmp directory for tmp files.
 
@@ -19623,11 +16429,7 @@
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
-} ||
-{
-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -19635,10 +16437,16 @@
 if test -n "$CONFIG_FILES"; then
 
 
-ac_cr='
'
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
 ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
 if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
+  ac_cs_awk_cr='\r'
 else
   ac_cs_awk_cr=$ac_cr
 fi
@@ -19652,24 +16460,18 @@
   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
   echo "_ACEOF"
 } >conf$$subs.sh ||
-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   . ./conf$$subs.sh ||
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
 
   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
   if test $ac_delim_n = $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -19691,7 +16493,7 @@
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -19705,7 +16507,7 @@
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
@@ -19758,9 +16560,7 @@
 else
   cat
 fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -19801,9 +16601,7 @@
   if test -z "$ac_t"; then
     break
   elif $ac_last_try; then
-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
   else
     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
   fi
@@ -19888,9 +16686,7 @@
 _ACAWK
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
 fi # test -n "$CONFIG_HEADERS"
 
 
@@ -19903,9 +16699,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
-   { (exit 1); exit 1; }; };;
+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -19933,12 +16727,10 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-   { (exit 1); exit 1; }; };;
+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      ac_file_inputs="$ac_file_inputs '$ac_f'"
+      as_fn_append ac_file_inputs " '$ac_f'"
     done
 
     # Let's still pretend it is `configure' which instantiates (i.e., don't
@@ -19949,7 +16741,7 @@
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
 $as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
@@ -19962,9 +16754,7 @@
 
     case $ac_tag in
     *:-:* | *:-) cat >"$tmp/stdin" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; } ;;
+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -19992,47 +16782,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-  { as_dir="$ac_dir"
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
 case "$ac_dir" in
@@ -20089,7 +16839,6 @@
 # If the template does not know about datarootdir, expand it.
 # FIXME: This hack should be removed a few years after 2.60.
 ac_datarootdir_hack=; ac_datarootdir_seen=
-
 ac_sed_dataroot='
 /datarootdir/ {
   p
@@ -20099,12 +16848,11 @@
 /@docdir@/p
 /@infodir@/p
 /@localedir@/p
-/@mandir@/p
-'
+/@mandir@/p'
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -20114,7 +16862,7 @@
   s&@infodir@&$infodir&g
   s&@localedir@&$localedir&g
   s&@mandir@&$mandir&g
-    s&\\\${datarootdir}&$datarootdir&g' ;;
+  s&\\\${datarootdir}&$datarootdir&g' ;;
 esac
 _ACEOF
 
@@ -20143,14 +16891,12 @@
 $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || 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"; } &&
-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+  { $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;}
@@ -20160,9 +16906,7 @@
   -) cat "$tmp/out" && rm -f "$tmp/out";;
   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
   esac \
-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+  || as_fn_error "could not create $ac_file" "$LINENO" 5
  ;;
   :H)
   #
@@ -20173,25 +16917,19 @@
       $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
     } >"$tmp/config.h" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+      { $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" \
-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
-$as_echo "$as_me: error: could not create $ac_file" >&2;}
-   { (exit 1); exit 1; }; }
+	|| 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" \
-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
-$as_echo "$as_me: error: could not create -" >&2;}
-   { (exit 1); exit 1; }; }
+      || as_fn_error "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -20229,7 +16967,7 @@
 	  s/.*/./; q'`/stamp-h$_am_stamp_count
  ;;
 
-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
 $as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
@@ -20324,47 +17062,7 @@
 	    q
 	  }
 	  s/.*/./; q'`
-      { as_dir=$dirpart/$fdir
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
-   { (exit 1); exit 1; }; }; }
+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
       # echo "creating $dirpart/$file"
       echo '# dummy' > "$dirpart/$file"
     done
@@ -21017,9 +17715,7 @@
       esac ;;
     "po/stamp-it":C)
     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
-       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
-   { (exit 1); exit 1; }; }
+       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
     fi
     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
     >"po/stamp-it.tmp"
@@ -21042,15 +17738,12 @@
 done # for ac_tag
 
 
-{ (exit 0); exit 0; }
+as_fn_exit 0
 _ACEOF
-chmod +x $CONFIG_STATUS
 ac_clean_files=$ac_clean_files_save
 
 test $ac_write_fail = 0 ||
-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
-   { (exit 1); exit 1; }; }
+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
@@ -21071,10 +17764,10 @@
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit $?
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
diff -Nru gnome-desktop-2.30.0/configure.in gnome-desktop-2.30.2/configure.in
--- gnome-desktop-2.30.0/configure.in	2010-03-09 13:17:32.000000000 +0100
+++ gnome-desktop-2.30.2/configure.in	2010-06-22 03:41:19.000000000 +0200
@@ -1,6 +1,6 @@
 m4_define(gnome_platform, 2)
 m4_define(gnome_minor, 30)
-m4_define(gnome_micro, 0)
+m4_define(gnome_micro, 2)
 dnl gnome_sub is an optional sub-version which will not be advertised to the user
 dnl It allows to release a 2.30.1.1 which is just a better 2.30.1
 dnl Leave empty if not needed
diff -Nru gnome-desktop-2.30.0/debian/changelog gnome-desktop-2.30.2/debian/changelog
--- gnome-desktop-2.30.0/debian/changelog	2010-06-22 11:41:21.000000000 +0200
+++ gnome-desktop-2.30.2/debian/changelog	2010-06-22 11:41:22.000000000 +0200
@@ -1,3 +1,9 @@
+gnome-desktop (1:2.30.2-0ubuntu1) lucid-proposed; urgency=low
+
+  * New upstream version (lp: #597167)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 22 Jun 2010 11:12:10 +0200
+
 gnome-desktop (1:2.30.0-0ubuntu1) lucid; urgency=low
 
   * New upstream version
diff -Nru gnome-desktop-2.30.0/desktop-docs/fdl/Makefile.in gnome-desktop-2.30.2/desktop-docs/fdl/Makefile.in
--- gnome-desktop-2.30.0/desktop-docs/fdl/Makefile.in	2010-03-30 23:14:54.000000000 +0200
+++ gnome-desktop-2.30.2/desktop-docs/fdl/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -177,6 +177,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/desktop-docs/gpl/Makefile.in gnome-desktop-2.30.2/desktop-docs/gpl/Makefile.in
--- gnome-desktop-2.30.0/desktop-docs/gpl/Makefile.in	2010-03-30 23:14:54.000000000 +0200
+++ gnome-desktop-2.30.2/desktop-docs/gpl/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -177,6 +177,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/desktop-docs/lgpl/Makefile.in gnome-desktop-2.30.2/desktop-docs/lgpl/Makefile.in
--- gnome-desktop-2.30.0/desktop-docs/lgpl/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/desktop-docs/lgpl/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -177,6 +177,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/desktop-docs/Makefile.in gnome-desktop-2.30.2/desktop-docs/Makefile.in
--- gnome-desktop-2.30.0/desktop-docs/Makefile.in	2010-03-30 23:14:54.000000000 +0200
+++ gnome-desktop-2.30.2/desktop-docs/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -192,6 +192,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -332,7 +333,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -357,7 +358,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff -Nru gnome-desktop-2.30.0/docs/Makefile.in gnome-desktop-2.30.2/docs/Makefile.in
--- gnome-desktop-2.30.0/docs/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/docs/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -192,6 +192,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -332,7 +333,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -357,7 +358,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/background.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/background.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/background.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/background.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="GnomeBG.html" title="GnomeBG">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/GnomeBG.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/GnomeBG.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/GnomeBG.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/GnomeBG.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="randr.html" title="Part III. Monitor Configuration">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -53,50 +48,50 @@
 enum                <a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType">GnomeBGColorType</a>;
 enum                <a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement">GnomeBGPlacement</a>;
 #define             <a class="link" href="GnomeBG.html#GNOME-BG-KEY-DIR:CAPS" title="GNOME_BG_KEY_DIR">GNOME_BG_KEY_DIR</a>
-<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *           <a class="link" href="GnomeBG.html#gnome-bg-new" title="gnome_bg_new ()">gnome_bg_new</a>                        (void);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-load-from-preferences" title="gnome_bg_load_from_preferences ()">gnome_bg_load_from_preferences</a>      (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GConfClient</span> *client);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-save-to-preferences" title="gnome_bg_save_to_preferences ()">gnome_bg_save_to_preferences</a>        (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GConfClient</span> *client);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-filename" title="gnome_bg_set_filename ()">gnome_bg_set_filename</a>               (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         const <span class="returnvalue">char</span> *filename);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-placement" title="gnome_bg_set_placement ()">gnome_bg_set_placement</a>              (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="returnvalue">GnomeBGPlacement</span></a> placement);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-color" title="gnome_bg_set_color ()">gnome_bg_set_color</a>                  (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="returnvalue">GnomeBGColorType</span></a> type,
-                                                         <span class="returnvalue">GdkColor</span> *primary,
-                                                         <span class="returnvalue">GdkColor</span> *secondary);
-const <span class="returnvalue">gchar</span> *       <a class="link" href="GnomeBG.html#gnome-bg-get-filename" title="gnome_bg_get_filename ()">gnome_bg_get_filename</a>               (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg);
-<a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="returnvalue">GnomeBGPlacement</span></a>    <a class="link" href="GnomeBG.html#gnome-bg-get-placement" title="gnome_bg_get_placement ()">gnome_bg_get_placement</a>              (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-get-color" title="gnome_bg_get_color ()">gnome_bg_get_color</a>                  (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="returnvalue">GnomeBGColorType</span></a> *type,
-                                                         <span class="returnvalue">GdkColor</span> *primary,
-                                                         <span class="returnvalue">GdkColor</span> *secondary);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-draw" title="gnome_bg_draw ()">gnome_bg_draw</a>                       (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GdkPixbuf</span> *dest,
-                                                         <span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">gboolean</span> is_root);
-<span class="returnvalue">GdkPixmap</span> *         <a class="link" href="GnomeBG.html#gnome-bg-create-pixmap" title="gnome_bg_create_pixmap ()">gnome_bg_create_pixmap</a>              (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GdkWindow</span> *window,
-                                                         <span class="returnvalue">int</span> width,
-                                                         <span class="returnvalue">int</span> height,
-                                                         <span class="returnvalue">gboolean</span> root);
-<span class="returnvalue">gboolean</span>            <a class="link" href="GnomeBG.html#gnome-bg-get-image-size" title="gnome_bg_get_image_size ()">gnome_bg_get_image_size</a>             (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         <span class="returnvalue">int</span> best_width,
-                                                         <span class="returnvalue">int</span> best_height,
-                                                         <span class="returnvalue">int</span> *width,
-                                                         <span class="returnvalue">int</span> *height);
-<span class="returnvalue">GdkPixbuf</span> *         <a class="link" href="GnomeBG.html#gnome-bg-create-thumbnail" title="gnome_bg_create_thumbnail ()">gnome_bg_create_thumbnail</a>           (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         <span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">int</span> dest_width,
-                                                         <span class="returnvalue">int</span> dest_height);
-<span class="returnvalue">gboolean</span>            <a class="link" href="GnomeBG.html#gnome-bg-is-dark" title="gnome_bg_is_dark ()">gnome_bg_is_dark</a>                    (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">int</span> dest_width,
-                                                         <span class="returnvalue">int</span> dest_height);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-pixmap-as-root" title="gnome_bg_set_pixmap_as_root ()">gnome_bg_set_pixmap_as_root</a>         (<span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">GdkPixmap</span> *pixmap);
+<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *           <a class="link" href="GnomeBG.html#gnome-bg-new" title="gnome_bg_new ()">gnome_bg_new</a>                        (<em class="parameter"><code><span class="type">void</span></code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-load-from-preferences" title="gnome_bg_load_from_preferences ()">gnome_bg_load_from_preferences</a>      (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GConfClient</span> *client</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-save-to-preferences" title="gnome_bg_save_to_preferences ()">gnome_bg_save_to_preferences</a>        (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GConfClient</span> *client</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-filename" title="gnome_bg_set_filename ()">gnome_bg_set_filename</a>               (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-placement" title="gnome_bg_set_placement ()">gnome_bg_set_placement</a>              (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="type">GnomeBGPlacement</span></a> placement</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-color" title="gnome_bg_set_color ()">gnome_bg_set_color</a>                  (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="type">GnomeBGColorType</span></a> type</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *primary</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *secondary</code></em>);
+const <span class="returnvalue">gchar</span> *       <a class="link" href="GnomeBG.html#gnome-bg-get-filename" title="gnome_bg_get_filename ()">gnome_bg_get_filename</a>               (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>);
+<a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="returnvalue">GnomeBGPlacement</span></a>    <a class="link" href="GnomeBG.html#gnome-bg-get-placement" title="gnome_bg_get_placement ()">gnome_bg_get_placement</a>              (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-get-color" title="gnome_bg_get_color ()">gnome_bg_get_color</a>                  (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="type">GnomeBGColorType</span></a> *type</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *primary</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *secondary</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-draw" title="gnome_bg_draw ()">gnome_bg_draw</a>                       (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkPixbuf</span> *dest</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> is_root</code></em>);
+<span class="returnvalue">GdkPixmap</span> *         <a class="link" href="GnomeBG.html#gnome-bg-create-pixmap" title="gnome_bg_create_pixmap ()">gnome_bg_create_pixmap</a>              (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkWindow</span> *window</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> height</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> root</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="GnomeBG.html#gnome-bg-get-image-size" title="gnome_bg_get_image_size ()">gnome_bg_get_image_size</a>             (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> best_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> best_height</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *height</code></em>);
+<span class="returnvalue">GdkPixbuf</span> *         <a class="link" href="GnomeBG.html#gnome-bg-create-thumbnail" title="gnome_bg_create_thumbnail ()">gnome_bg_create_thumbnail</a>           (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_height</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="GnomeBG.html#gnome-bg-is-dark" title="gnome_bg_is_dark ()">gnome_bg_is_dark</a>                    (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_height</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeBG.html#gnome-bg-set-pixmap-as-root" title="gnome_bg_set_pixmap_as_root ()">gnome_bg_set_pixmap_as_root</a>         (<em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkPixmap</span> *pixmap</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
@@ -164,7 +159,7 @@
 <hr>
 <div class="refsect2" title="gnome_bg_new ()">
 <a name="gnome-bg-new"></a><h3>gnome_bg_new ()</h3>
-<pre class="programlisting"><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *           gnome_bg_new                        (void);</pre>
+<pre class="programlisting"><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *           gnome_bg_new                        (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -179,8 +174,8 @@
 <hr>
 <div class="refsect2" title="gnome_bg_load_from_preferences ()">
 <a name="gnome-bg-load-from-preferences"></a><h3>gnome_bg_load_from_preferences ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_load_from_preferences      (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GConfClient</span> *client);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_load_from_preferences      (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GConfClient</span> *client</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -202,8 +197,8 @@
 <hr>
 <div class="refsect2" title="gnome_bg_save_to_preferences ()">
 <a name="gnome-bg-save-to-preferences"></a><h3>gnome_bg_save_to_preferences ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_save_to_preferences        (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GConfClient</span> *client);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_save_to_preferences        (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GConfClient</span> *client</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -225,8 +220,8 @@
 <hr>
 <div class="refsect2" title="gnome_bg_set_filename ()">
 <a name="gnome-bg-set-filename"></a><h3>gnome_bg_set_filename ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_filename               (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         const <span class="returnvalue">char</span> *filename);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_filename               (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *filename</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -248,8 +243,8 @@
 <hr>
 <div class="refsect2" title="gnome_bg_set_placement ()">
 <a name="gnome-bg-set-placement"></a><h3>gnome_bg_set_placement ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_placement              (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="returnvalue">GnomeBGPlacement</span></a> placement);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_placement              (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="type">GnomeBGPlacement</span></a> placement</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -271,10 +266,10 @@
 <hr>
 <div class="refsect2" title="gnome_bg_set_color ()">
 <a name="gnome-bg-set-color"></a><h3>gnome_bg_set_color ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_color                  (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="returnvalue">GnomeBGColorType</span></a> type,
-                                                         <span class="returnvalue">GdkColor</span> *primary,
-                                                         <span class="returnvalue">GdkColor</span> *secondary);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_color                  (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="type">GnomeBGColorType</span></a> type</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *primary</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *secondary</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -306,7 +301,7 @@
 <hr>
 <div class="refsect2" title="gnome_bg_get_filename ()">
 <a name="gnome-bg-get-filename"></a><h3>gnome_bg_get_filename ()</h3>
-<pre class="programlisting">const <span class="returnvalue">gchar</span> *       gnome_bg_get_filename               (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg);</pre>
+<pre class="programlisting">const <span class="returnvalue">gchar</span> *       gnome_bg_get_filename               (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -328,7 +323,7 @@
 <hr>
 <div class="refsect2" title="gnome_bg_get_placement ()">
 <a name="gnome-bg-get-placement"></a><h3>gnome_bg_get_placement ()</h3>
-<pre class="programlisting"><a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="returnvalue">GnomeBGPlacement</span></a>    gnome_bg_get_placement              (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg);</pre>
+<pre class="programlisting"><a class="link" href="GnomeBG.html#GnomeBGPlacement" title="enum GnomeBGPlacement"><span class="returnvalue">GnomeBGPlacement</span></a>    gnome_bg_get_placement              (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -350,10 +345,10 @@
 <hr>
 <div class="refsect2" title="gnome_bg_get_color ()">
 <a name="gnome-bg-get-color"></a><h3>gnome_bg_get_color ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_get_color                  (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="returnvalue">GnomeBGColorType</span></a> *type,
-                                                         <span class="returnvalue">GdkColor</span> *primary,
-                                                         <span class="returnvalue">GdkColor</span> *secondary);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_get_color                  (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeBG.html#GnomeBGColorType" title="enum GnomeBGColorType"><span class="type">GnomeBGColorType</span></a> *type</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *primary</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *secondary</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -385,10 +380,10 @@
 <hr>
 <div class="refsect2" title="gnome_bg_draw ()">
 <a name="gnome-bg-draw"></a><h3>gnome_bg_draw ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_draw                       (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GdkPixbuf</span> *dest,
-                                                         <span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">gboolean</span> is_root);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_draw                       (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkPixbuf</span> *dest</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> is_root</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -420,11 +415,11 @@
 <hr>
 <div class="refsect2" title="gnome_bg_create_pixmap ()">
 <a name="gnome-bg-create-pixmap"></a><h3>gnome_bg_create_pixmap ()</h3>
-<pre class="programlisting"><span class="returnvalue">GdkPixmap</span> *         gnome_bg_create_pixmap              (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">GdkWindow</span> *window,
-                                                         <span class="returnvalue">int</span> width,
-                                                         <span class="returnvalue">int</span> height,
-                                                         <span class="returnvalue">gboolean</span> root);</pre>
+<pre class="programlisting"><span class="returnvalue">GdkPixmap</span> *         gnome_bg_create_pixmap              (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkWindow</span> *window</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> height</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> root</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -466,12 +461,12 @@
 <hr>
 <div class="refsect2" title="gnome_bg_get_image_size ()">
 <a name="gnome-bg-get-image-size"></a><h3>gnome_bg_get_image_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_bg_get_image_size             (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         <span class="returnvalue">int</span> best_width,
-                                                         <span class="returnvalue">int</span> best_height,
-                                                         <span class="returnvalue">int</span> *width,
-                                                         <span class="returnvalue">int</span> *height);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_bg_get_image_size             (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> best_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> best_height</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *height</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -518,11 +513,11 @@
 <hr>
 <div class="refsect2" title="gnome_bg_create_thumbnail ()">
 <a name="gnome-bg-create-thumbnail"></a><h3>gnome_bg_create_thumbnail ()</h3>
-<pre class="programlisting"><span class="returnvalue">GdkPixbuf</span> *         gnome_bg_create_thumbnail           (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         <span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">int</span> dest_width,
-                                                         <span class="returnvalue">int</span> dest_height);</pre>
+<pre class="programlisting"><span class="returnvalue">GdkPixbuf</span> *         gnome_bg_create_thumbnail           (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_height</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -564,9 +559,9 @@
 <hr>
 <div class="refsect2" title="gnome_bg_is_dark ()">
 <a name="gnome-bg-is-dark"></a><h3>gnome_bg_is_dark ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_bg_is_dark                    (<a class="link" href="GnomeBG.html" title="GnomeBG"><span class="returnvalue">GnomeBG</span></a> *bg,
-                                                         <span class="returnvalue">int</span> dest_width,
-                                                         <span class="returnvalue">int</span> dest_height);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_bg_is_dark                    (<em class="parameter"><code><a class="link" href="GnomeBG.html" title="GnomeBG"><span class="type">GnomeBG</span></a> *bg</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_height</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -598,8 +593,8 @@
 <hr>
 <div class="refsect2" title="gnome_bg_set_pixmap_as_root ()">
 <a name="gnome-bg-set-pixmap-as-root"></a><h3>gnome_bg_set_pixmap_as_root ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_pixmap_as_root         (<span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">GdkPixmap</span> *pixmap);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_bg_set_pixmap_as_root         (<em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkPixmap</span> *pixmap</code></em>);</pre>
 <p>
 Set the root pixmap, and properties pointing to it. We
 do this atomically with a server grab to make sure that
@@ -612,12 +607,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>screen</code></em> :</span></p></td>
-<td> the <span class="type">GdkScreen</span> to change root background on
+<td>the <span class="type">GdkScreen</span> to change root background on
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>pixmap</code></em> :</span></p></td>
-<td> the <span class="type">GdkPixmap</span> to set root background from
+<td>the <span class="type">GdkPixmap</span> to set root background from
 </td>
 </tr>
 </tbody>
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-GnomeDesktopItem.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-GnomeDesktopItem.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-GnomeDesktopItem.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-GnomeDesktopItem.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-Miscellaneous-Functions.html" title="Miscellaneous Functions">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -85,115 +80,116 @@
 enum                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemIconFlags" title="enum GnomeDesktopItemIconFlags">GnomeDesktopItemIconFlags</a>;
 enum                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemError" title="enum GnomeDesktopItemError">GnomeDesktopItemError</a>;
 #define             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GNOME-DESKTOP-ITEM-ERROR:CAPS" title="GNOME_DESKTOP_ITEM_ERROR">GNOME_DESKTOP_ITEM_ERROR</a>
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new" title="gnome_desktop_item_new ()">gnome_desktop_item_new</a>              (void);
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-file" title="gnome_desktop_item_new_from_file ()">gnome_desktop_item_new_from_file</a>    (const <span class="returnvalue">char</span> *file,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-uri" title="gnome_desktop_item_new_from_uri ()">gnome_desktop_item_new_from_uri</a>     (const <span class="returnvalue">char</span> *uri,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-string" title="gnome_desktop_item_new_from_string ()">gnome_desktop_item_new_from_string</a>  (const <span class="returnvalue">char</span> *uri,
-                                                         const <span class="returnvalue">char</span> *string,
-                                                         <span class="returnvalue">gssize</span> length,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new" title="gnome_desktop_item_new ()">gnome_desktop_item_new</a>              (<em class="parameter"><code><span class="type">void</span></code></em>);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-file" title="gnome_desktop_item_new_from_file ()">gnome_desktop_item_new_from_file</a>    (<em class="parameter"><code>const <span class="type">char</span> *file</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-uri" title="gnome_desktop_item_new_from_uri ()">gnome_desktop_item_new_from_uri</a>     (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-string" title="gnome_desktop_item_new_from_string ()">gnome_desktop_item_new_from_string</a>  (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *string</code></em>,
+                                                         <em class="parameter"><code><span class="type">gssize</span> length</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-new-from-basename" title="gnome_desktop_item_new_from_basename ()">gnome_desktop_item_new_from_basename</a>
-                                                        (const <span class="returnvalue">char</span> *basename,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-copy" title="gnome_desktop_item_copy ()">gnome_desktop_item_copy</a>             (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-save" title="gnome_desktop_item_save ()">gnome_desktop_item_save</a>             (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *under,
-                                                         <span class="returnvalue">gboolean</span> force,
-                                                         <span class="returnvalue">GError</span> **error);
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-ref" title="gnome_desktop_item_ref ()">gnome_desktop_item_ref</a>              (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-unref" title="gnome_desktop_item_unref ()">gnome_desktop_item_unref</a>            (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-launch" title="gnome_desktop_item_launch ()">gnome_desktop_item_launch</a>           (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GList</span> *file_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-launch-with-env" title="gnome_desktop_item_launch_with_env ()">gnome_desktop_item_launch_with_env</a>  (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GList</span> *file_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">char</span> **envp,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-launch-on-screen" title="gnome_desktop_item_launch_on_screen ()">gnome_desktop_item_launch_on_screen</a> (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GList</span> *file_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">int</span> workspace,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-drop-uri-list" title="gnome_desktop_item_drop_uri_list ()">gnome_desktop_item_drop_uri_list</a>    (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *uri_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);
+                                                        (<em class="parameter"><code>const <span class="type">char</span> *basename</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-copy" title="gnome_desktop_item_copy ()">gnome_desktop_item_copy</a>             (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-save" title="gnome_desktop_item_save ()">gnome_desktop_item_save</a>             (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *under</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> force</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-ref" title="gnome_desktop_item_ref ()">gnome_desktop_item_ref</a>              (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-unref" title="gnome_desktop_item_unref ()">gnome_desktop_item_unref</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-launch" title="gnome_desktop_item_launch ()">gnome_desktop_item_launch</a>           (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GList</span> *file_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-launch-with-env" title="gnome_desktop_item_launch_with_env ()">gnome_desktop_item_launch_with_env</a>  (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GList</span> *file_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **envp</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-launch-on-screen" title="gnome_desktop_item_launch_on_screen ()">gnome_desktop_item_launch_on_screen</a> (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GList</span> *file_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> workspace</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-drop-uri-list" title="gnome_desktop_item_drop_uri_list ()">gnome_desktop_item_drop_uri_list</a>    (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
 <span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-drop-uri-list-with-env" title="gnome_desktop_item_drop_uri_list_with_env ()">gnome_desktop_item_drop_uri_list_with_env</a>
-                                                        (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *uri_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">char</span> **envp,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-exists" title="gnome_desktop_item_exists ()">gnome_desktop_item_exists</a>           (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="returnvalue">GnomeDesktopItemType</span></a>  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-entry-type" title="gnome_desktop_item_get_entry_type ()">gnome_desktop_item_get_entry_type</a> (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-entry-type" title="gnome_desktop_item_set_entry_type ()">gnome_desktop_item_set_entry_type</a>   (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="returnvalue">GnomeDesktopItemType</span></a> type);
-const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-location" title="gnome_desktop_item_get_location ()">gnome_desktop_item_get_location</a>     (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-location" title="gnome_desktop_item_set_location ()">gnome_desktop_item_set_location</a>     (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *location);
+                                                        (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **envp</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-exists" title="gnome_desktop_item_exists ()">gnome_desktop_item_exists</a>           (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="returnvalue">GnomeDesktopItemType</span></a>  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-entry-type" title="gnome_desktop_item_get_entry_type ()">gnome_desktop_item_get_entry_type</a> (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-entry-type" title="gnome_desktop_item_set_entry_type ()">gnome_desktop_item_set_entry_type</a>   (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="type">GnomeDesktopItemType</span></a> type</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-location" title="gnome_desktop_item_get_location ()">gnome_desktop_item_get_location</a>     (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-location" title="gnome_desktop_item_set_location ()">gnome_desktop_item_set_location</a>     (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *location</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-location-file" title="gnome_desktop_item_set_location_file ()">gnome_desktop_item_set_location_file</a>
-                                                        (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *file);
+                                                        (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *file</code></em>);
 <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemStatus" title="enum GnomeDesktopItemStatus"><span class="returnvalue">GnomeDesktopItemStatus</span></a>  <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-file-status" title="gnome_desktop_item_get_file_status ()">gnome_desktop_item_get_file_status</a>
-                                                        (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);
-<span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-icon" title="gnome_desktop_item_get_icon ()">gnome_desktop_item_get_icon</a>         (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GtkIconTheme</span> *icon_theme);
-<span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-find-icon" title="gnome_desktop_item_find_icon ()">gnome_desktop_item_find_icon</a>        (<span class="returnvalue">GtkIconTheme</span> *icon_theme,
-                                                         const <span class="returnvalue">char</span> *icon,
-                                                         <span class="returnvalue">int</span> desired_size,
-                                                         <span class="returnvalue">int</span> flags);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-attr-exists" title="gnome_desktop_item_attr_exists ()">gnome_desktop_item_attr_exists</a>      (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-string" title="gnome_desktop_item_get_string ()">gnome_desktop_item_get_string</a>       (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-string" title="gnome_desktop_item_set_string ()">gnome_desktop_item_set_string</a>       (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *value);
-const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-attr-locale" title="gnome_desktop_item_get_attr_locale ()">gnome_desktop_item_get_attr_locale</a>  (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-localestring" title="gnome_desktop_item_get_localestring ()">gnome_desktop_item_get_localestring</a> (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
+                                                        (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-icon" title="gnome_desktop_item_get_icon ()">gnome_desktop_item_get_icon</a>         (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GtkIconTheme</span> *icon_theme</code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-find-icon" title="gnome_desktop_item_find_icon ()">gnome_desktop_item_find_icon</a>        (<em class="parameter"><code><span class="type">GtkIconTheme</span> *icon_theme</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *icon</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> desired_size</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> flags</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-attr-exists" title="gnome_desktop_item_attr_exists ()">gnome_desktop_item_attr_exists</a>      (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-string" title="gnome_desktop_item_get_string ()">gnome_desktop_item_get_string</a>       (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-string" title="gnome_desktop_item_set_string ()">gnome_desktop_item_set_string</a>       (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-attr-locale" title="gnome_desktop_item_get_attr_locale ()">gnome_desktop_item_get_attr_locale</a>  (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-localestring" title="gnome_desktop_item_get_localestring ()">gnome_desktop_item_get_localestring</a> (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
 const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-localestring-lang" title="gnome_desktop_item_get_localestring_lang ()">gnome_desktop_item_get_localestring_lang</a>
-                                                        (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *language);
-<span class="returnvalue">GList</span> *             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-languages" title="gnome_desktop_item_get_languages ()">gnome_desktop_item_get_languages</a>    (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-localestring" title="gnome_desktop_item_set_localestring ()">gnome_desktop_item_set_localestring</a> (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *value);
+                                                        (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *language</code></em>);
+<span class="returnvalue">GList</span> *             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-languages" title="gnome_desktop_item_get_languages ()">gnome_desktop_item_get_languages</a>    (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-localestring" title="gnome_desktop_item_set_localestring ()">gnome_desktop_item_set_localestring</a> (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-localestring-lang" title="gnome_desktop_item_set_localestring_lang ()">gnome_desktop_item_set_localestring_lang</a>
-                                                        (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *language,
-                                                         const <span class="returnvalue">char</span> *value);
+                                                        (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *language</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-clear-localestring" title="gnome_desktop_item_clear_localestring ()">gnome_desktop_item_clear_localestring</a>
-                                                        (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-<span class="returnvalue">char</span> **             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-strings" title="gnome_desktop_item_get_strings ()">gnome_desktop_item_get_strings</a>      (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-strings" title="gnome_desktop_item_set_strings ()">gnome_desktop_item_set_strings</a>      (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         <span class="returnvalue">char</span> **strings);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-boolean" title="gnome_desktop_item_get_boolean ()">gnome_desktop_item_get_boolean</a>      (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-boolean" title="gnome_desktop_item_set_boolean ()">gnome_desktop_item_set_boolean</a>      (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         <span class="returnvalue">gboolean</span> value);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-launch-time" title="gnome_desktop_item_set_launch_time ()">gnome_desktop_item_set_launch_time</a>  (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">guint32</span> timestamp);
-#define             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-clear-attr" title="gnome_desktop_item_clear_attr()">gnome_desktop_item_clear_attr</a>       (item,attr)
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-clear-section" title="gnome_desktop_item_clear_section ()">gnome_desktop_item_clear_section</a>    (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *section);
+                                                        (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+<span class="returnvalue">char</span> **             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-strings" title="gnome_desktop_item_get_strings ()">gnome_desktop_item_get_strings</a>      (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-strings" title="gnome_desktop_item_set_strings ()">gnome_desktop_item_set_strings</a>      (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **strings</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-get-boolean" title="gnome_desktop_item_get_boolean ()">gnome_desktop_item_get_boolean</a>      (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-boolean" title="gnome_desktop_item_set_boolean ()">gnome_desktop_item_set_boolean</a>      (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-set-launch-time" title="gnome_desktop_item_set_launch_time ()">gnome_desktop_item_set_launch_time</a>  (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint32</span> timestamp</code></em>);
+#define             <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-clear-attr" title="gnome_desktop_item_clear_attr()">gnome_desktop_item_clear_attr</a>       (item,
+                                                         attr)
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-GnomeDesktopItem.html#gnome-desktop-item-clear-section" title="gnome_desktop_item_clear_section ()">gnome_desktop_item_clear_section</a>    (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *section</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -573,7 +569,7 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_new ()">
 <a name="gnome-desktop-item-new"></a><h3>gnome_desktop_item_new ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new              (void);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new              (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 Creates a GnomeDesktopItem object. The reference count on the returned value is set to '1'.</p>
 <div class="variablelist"><table border="0">
@@ -588,9 +584,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_new_from_file ()">
 <a name="gnome-desktop-item-new-from-file"></a><h3>gnome_desktop_item_new_from_file ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_file    (const <span class="returnvalue">char</span> *file,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_file    (<em class="parameter"><code>const <span class="type">char</span> *file</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 This function loads 'file' and turns it into a GnomeDesktopItem.</p>
 <div class="variablelist"><table border="0">
@@ -598,12 +594,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>file</code></em> :</span></p></td>
-<td> The filename or directory path to load the GnomeDesktopItem from
+<td>The filename or directory path to load the GnomeDesktopItem from
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> Flags to influence the loading process
+<td>Flags to influence the loading process
 </td>
 </tr>
 <tr>
@@ -622,9 +618,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_new_from_uri ()">
 <a name="gnome-desktop-item-new-from-uri"></a><h3>gnome_desktop_item_new_from_uri ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_uri     (const <span class="returnvalue">char</span> *uri,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_uri     (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 This function loads 'uri' and turns it into a GnomeDesktopItem.</p>
 <div class="variablelist"><table border="0">
@@ -632,12 +628,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> URI to load the GnomeDesktopItem from
+<td>URI to load the GnomeDesktopItem from
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> Flags to influence the loading process
+<td>Flags to influence the loading process
 </td>
 </tr>
 <tr>
@@ -656,11 +652,11 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_new_from_string ()">
 <a name="gnome-desktop-item-new-from-string"></a><h3>gnome_desktop_item_new_from_string ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_string  (const <span class="returnvalue">char</span> *uri,
-                                                         const <span class="returnvalue">char</span> *string,
-                                                         <span class="returnvalue">gssize</span> length,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_string  (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *string</code></em>,
+                                                         <em class="parameter"><code><span class="type">gssize</span> length</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 This function turns the contents of the string into a GnomeDesktopItem.</p>
 <div class="variablelist"><table border="0">
@@ -673,22 +669,22 @@
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>string</code></em> :</span></p></td>
-<td> string to load the GnomeDesktopItem from
+<td>string to load the GnomeDesktopItem from
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td>
-<td> length of string, or -1 to use strlen
+<td>length of string, or -1 to use strlen
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> Flags to influence the loading process
+<td>Flags to influence the loading process
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> place to put errors
+<td>place to put errors
 </td>
 </tr>
 <tr>
@@ -703,9 +699,9 @@
 <div class="refsect2" title="gnome_desktop_item_new_from_basename ()">
 <a name="gnome-desktop-item-new-from-basename"></a><h3>gnome_desktop_item_new_from_basename ()</h3>
 <pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_new_from_basename
-                                                        (const <span class="returnvalue">char</span> *basename,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="returnvalue">GnomeDesktopItemLoadFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+                                                        (<em class="parameter"><code>const <span class="type">char</span> *basename</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLoadFlags" title="enum GnomeDesktopItemLoadFlags"><span class="type">GnomeDesktopItemLoadFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 This function loads 'basename' from a system data directory and 
 returns its GnomeDesktopItem.</p>
@@ -714,12 +710,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>basename</code></em> :</span></p></td>
-<td> The basename of the GnomeDesktopItem to load.
+<td>The basename of the GnomeDesktopItem to load.
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> Flags to influence the loading process
+<td>Flags to influence the loading process
 </td>
 </tr>
 <tr>
@@ -738,7 +734,7 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_copy ()">
 <a name="gnome-desktop-item-copy"></a><h3>gnome_desktop_item_copy ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_copy             (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_copy             (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <p>
 Creates a copy of a GnomeDesktopItem.  The new copy has a refcount of 1.
 Note: Section stack is NOT copied.</p>
@@ -747,7 +743,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> The item to be copied
+<td>The item to be copied
 </td>
 </tr>
 <tr>
@@ -761,10 +757,10 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_save ()">
 <a name="gnome-desktop-item-save"></a><h3>gnome_desktop_item_save ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_save             (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *under,
-                                                         <span class="returnvalue">gboolean</span> force,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_save             (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *under</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> force</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 Writes the specified item to disk.  If the 'under' is NULL, the original
 location is used.  It sets the location of this entry to point to the
@@ -774,22 +770,23 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>under</code></em> :</span></p></td>
-<td> A new uri (location) for this <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a>
+<td>A new uri (location) for this <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>force</code></em> :</span></p></td>
-<td> Save even if it wasn't modified
+<td>Save even if it wasn't modified
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> <span class="type">GError</span> return
+<td>
+<span class="type">GError</span> return
 </td>
 </tr>
 <tr>
@@ -803,7 +800,7 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_ref ()">
 <a name="gnome-desktop-item-ref"></a><h3>gnome_desktop_item_ref ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_ref              (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *  gnome_desktop_item_ref              (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <p>
 Increases the reference count of the specified item.</p>
 <div class="variablelist"><table border="0">
@@ -811,7 +808,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
@@ -825,14 +822,14 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_unref ()">
 <a name="gnome-desktop-item-unref"></a><h3>gnome_desktop_item_unref ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_unref            (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_unref            (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <p>
 Decreases the reference count of the specified item, and destroys the item if there are no more references left.</p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody><tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr></tbody>
 </table></div>
@@ -840,10 +837,10 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_launch ()">
 <a name="gnome-desktop-item-launch"></a><h3>gnome_desktop_item_launch ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_launch           (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GList</span> *file_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_launch           (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GList</span> *file_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 This function runs the program listed in the specified 'item',
 optionally appending additional arguments to its command line.  It uses
@@ -858,22 +855,22 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>file_list</code></em> :</span></p></td>
-<td>  Files/URIs to launch this item with, can be <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>Files/URIs to launch this item with, can be <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
@@ -889,11 +886,11 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_launch_with_env ()">
 <a name="gnome-desktop-item-launch-with-env"></a><h3>gnome_desktop_item_launch_with_env ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_launch_with_env  (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GList</span> *file_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">char</span> **envp,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_launch_with_env  (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GList</span> *file_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **envp</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 See gnome_desktop_item_launch for a full description. This function
 additionally passes an environment vector for the child process
@@ -903,27 +900,27 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>file_list</code></em> :</span></p></td>
-<td>  Files/URIs to launch this item with, can be <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>Files/URIs to launch this item with, can be <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>envp</code></em> :</span></p></td>
-<td> child's environment, or <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to inherit parent's
+<td>child's environment, or <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a> to inherit parent's
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
@@ -939,12 +936,12 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_launch_on_screen ()">
 <a name="gnome-desktop-item-launch-on-screen"></a><h3>gnome_desktop_item_launch_on_screen ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_launch_on_screen (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GList</span> *file_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">GdkScreen</span> *screen,
-                                                         <span class="returnvalue">int</span> workspace,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_launch_on_screen (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GList</span> *file_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> workspace</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 See gnome_desktop_item_launch for a full description. This function
 additionally attempts to launch the application on a given screen
@@ -954,32 +951,32 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>file_list</code></em> :</span></p></td>
-<td>  Files/URIs to launch this item with, can be <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>Files/URIs to launch this item with, can be <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>screen</code></em> :</span></p></td>
-<td> the <code class="literal">GdkScreen</code> on which the application should be launched
+<td>the <code class="literal">GdkScreen</code> on which the application should be launched
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>workspace</code></em> :</span></p></td>
-<td> the workspace on which the app should be launched (-1 for current)
+<td>the workspace on which the app should be launched (-1 for current)
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
@@ -995,10 +992,10 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_drop_uri_list ()">
 <a name="gnome-desktop-item-drop-uri-list"></a><h3>gnome_desktop_item_drop_uri_list ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_drop_uri_list    (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *uri_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_drop_uri_list    (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 A list of files or urls dropped onto an icon, the proper (Url or File)
 exec is run you can pass directly string that you got as the
@@ -1008,22 +1005,22 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri_list</code></em> :</span></p></td>
-<td> text as gotten from a text/uri-list
+<td>text as gotten from a text/uri-list
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
@@ -1040,11 +1037,11 @@
 <div class="refsect2" title="gnome_desktop_item_drop_uri_list_with_env ()">
 <a name="gnome-desktop-item-drop-uri-list-with-env"></a><h3>gnome_desktop_item_drop_uri_list_with_env ()</h3>
 <pre class="programlisting"><span class="returnvalue">int</span>                 gnome_desktop_item_drop_uri_list_with_env
-                                                        (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *uri_list,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="returnvalue">GnomeDesktopItemLaunchFlags</span></a> flags,
-                                                         <span class="returnvalue">char</span> **envp,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+                                                        (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri_list</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemLaunchFlags" title="enum GnomeDesktopItemLaunchFlags"><span class="type">GnomeDesktopItemLaunchFlags</span></a> flags</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **envp</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 See gnome_desktop_item_drop_uri_list for a full description. This function
 additionally passes an environment vector for the child process
@@ -1054,27 +1051,27 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri_list</code></em> :</span></p></td>
-<td> text as gotten from a text/uri-list
+<td>text as gotten from a text/uri-list
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>envp</code></em> :</span></p></td>
-<td> child's environment
+<td>child's environment
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
@@ -1090,7 +1087,7 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_exists ()">
 <a name="gnome-desktop-item-exists"></a><h3>gnome_desktop_item_exists ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_exists           (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_exists           (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <p>
 Attempt to figure out if the program that can be executed by this item
 actually exists.  First it tries the TryExec attribute to see if that
@@ -1101,7 +1098,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
@@ -1115,7 +1112,7 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_entry_type ()">
 <a name="gnome-desktop-item-get-entry-type"></a><h3>gnome_desktop_item_get_entry_type ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="returnvalue">GnomeDesktopItemType</span></a>  gnome_desktop_item_get_entry_type (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="returnvalue">GnomeDesktopItemType</span></a>  gnome_desktop_item_get_entry_type (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <p>
 Gets the type attribute (the 'Type' field) of the item.  This should
 usually be 'Application' for an application, but it can be 'Directory'
@@ -1127,7 +1124,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
@@ -1142,8 +1139,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_entry_type ()">
 <a name="gnome-desktop-item-set-entry-type"></a><h3>gnome_desktop_item_set_entry_type ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_entry_type   (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="returnvalue">GnomeDesktopItemType</span></a> type);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_entry_type   (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemType" title="enum GnomeDesktopItemType"><span class="type">GnomeDesktopItemType</span></a> type</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1165,13 +1162,13 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_location ()">
 <a name="gnome-desktop-item-get-location"></a><h3>gnome_desktop_item_get_location ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_location     (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_location     (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
@@ -1186,8 +1183,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_location ()">
 <a name="gnome-desktop-item-set-location"></a><h3>gnome_desktop_item_set_location ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_location     (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *location);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_location     (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *location</code></em>);</pre>
 <p>
 Set's the 'location' uri of this item.</p>
 <div class="variablelist"><table border="0">
@@ -1195,12 +1192,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>location</code></em> :</span></p></td>
-<td> A uri string specifying the file location of this particular item.
+<td>A uri string specifying the file location of this particular item.
 </td>
 </tr>
 </tbody>
@@ -1210,8 +1207,8 @@
 <div class="refsect2" title="gnome_desktop_item_set_location_file ()">
 <a name="gnome-desktop-item-set-location-file"></a><h3>gnome_desktop_item_set_location_file ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_location_file
-                                                        (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *file);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *file</code></em>);</pre>
 <p>
 Set's the 'location' uri of this item to the given <em class="parameter"><code>file</code></em>.</p>
 <div class="variablelist"><table border="0">
@@ -1219,12 +1216,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>file</code></em> :</span></p></td>
-<td> A local filename specifying the file location of this particular item.
+<td>A local filename specifying the file location of this particular item.
 </td>
 </tr>
 </tbody>
@@ -1234,7 +1231,7 @@
 <div class="refsect2" title="gnome_desktop_item_get_file_status ()">
 <a name="gnome-desktop-item-get-file-status"></a><h3>gnome_desktop_item_get_file_status ()</h3>
 <pre class="programlisting"><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItemStatus" title="enum GnomeDesktopItemStatus"><span class="returnvalue">GnomeDesktopItemStatus</span></a>  gnome_desktop_item_get_file_status
-                                                        (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item);</pre>
+                                                        (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>);</pre>
 <p>
 This function checks the modification time of the on-disk file to
 see if it is more recent than the in-memory data.</p>
@@ -1243,7 +1240,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
@@ -1257,8 +1254,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_icon ()">
 <a name="gnome-desktop-item-get-icon"></a><h3>gnome_desktop_item_get_icon ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_item_get_icon         (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">GtkIconTheme</span> *icon_theme);</pre>
+<pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_item_get_icon         (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">GtkIconTheme</span> *icon_theme</code></em>);</pre>
 <p>
 This function goes and looks for the icon file.  If the icon
 is not set as an absolute filename, this will look for it in the standard places.
@@ -1268,12 +1265,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>item</code></em> :</span></p></td>
-<td> A desktop item
+<td>A desktop item
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>icon_theme</code></em> :</span></p></td>
-<td> a <span class="type">GtkIconTheme</span>
+<td>a <span class="type">GtkIconTheme</span>
 </td>
 </tr>
 <tr>
@@ -1287,10 +1284,10 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_find_icon ()">
 <a name="gnome-desktop-item-find-icon"></a><h3>gnome_desktop_item_find_icon ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_item_find_icon        (<span class="returnvalue">GtkIconTheme</span> *icon_theme,
-                                                         const <span class="returnvalue">char</span> *icon,
-                                                         <span class="returnvalue">int</span> desired_size,
-                                                         <span class="returnvalue">int</span> flags);</pre>
+<pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_item_find_icon        (<em class="parameter"><code><span class="type">GtkIconTheme</span> *icon_theme</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *icon</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> desired_size</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> flags</code></em>);</pre>
 <p>
 This function goes and looks for the icon file.  If the icon
 is not an absolute filename, this will look for it in the standard places.
@@ -1300,22 +1297,22 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>icon_theme</code></em> :</span></p></td>
-<td> a <span class="type">GtkIconTheme</span>
+<td>a <span class="type">GtkIconTheme</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>icon</code></em> :</span></p></td>
-<td> icon name, something you'd get out of the Icon key
+<td>icon name, something you'd get out of the Icon key
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>desired_size</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>flags</code></em> :</span></p></td>
-<td> FIXME
+<td>FIXME
 </td>
 </tr>
 <tr>
@@ -1329,8 +1326,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_attr_exists ()">
 <a name="gnome-desktop-item-attr-exists"></a><h3>gnome_desktop_item_attr_exists ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_attr_exists      (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_attr_exists      (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1357,8 +1354,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_string ()">
 <a name="gnome-desktop-item-get-string"></a><h3>gnome_desktop_item_get_string ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_string       (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_string       (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1385,9 +1382,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_string ()">
 <a name="gnome-desktop-item-set-string"></a><h3>gnome_desktop_item_set_string ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_string       (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *value);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_string       (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1414,8 +1411,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_attr_locale ()">
 <a name="gnome-desktop-item-get-attr-locale"></a><h3>gnome_desktop_item_get_attr_locale ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_attr_locale  (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_attr_locale  (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1442,8 +1439,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_localestring ()">
 <a name="gnome-desktop-item-get-localestring"></a><h3>gnome_desktop_item_get_localestring ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_localestring (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_localestring (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1471,9 +1468,9 @@
 <div class="refsect2" title="gnome_desktop_item_get_localestring_lang ()">
 <a name="gnome-desktop-item-get-localestring-lang"></a><h3>gnome_desktop_item_get_localestring_lang ()</h3>
 <pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_desktop_item_get_localestring_lang
-                                                        (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *language);</pre>
+                                                        (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *language</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1505,8 +1502,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_languages ()">
 <a name="gnome-desktop-item-get-languages"></a><h3>gnome_desktop_item_get_languages ()</h3>
-<pre class="programlisting"><span class="returnvalue">GList</span> *             gnome_desktop_item_get_languages    (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting"><span class="returnvalue">GList</span> *             gnome_desktop_item_get_languages    (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1533,9 +1530,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_localestring ()">
 <a name="gnome-desktop-item-set-localestring"></a><h3>gnome_desktop_item_set_localestring ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_localestring (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *value);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_localestring (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1563,10 +1560,10 @@
 <div class="refsect2" title="gnome_desktop_item_set_localestring_lang ()">
 <a name="gnome-desktop-item-set-localestring-lang"></a><h3>gnome_desktop_item_set_localestring_lang ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_localestring_lang
-                                                        (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         const <span class="returnvalue">char</span> *language,
-                                                         const <span class="returnvalue">char</span> *value);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *language</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *value</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1599,8 +1596,8 @@
 <div class="refsect2" title="gnome_desktop_item_clear_localestring ()">
 <a name="gnome-desktop-item-clear-localestring"></a><h3>gnome_desktop_item_clear_localestring ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_clear_localestring
-                                                        (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1622,8 +1619,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_strings ()">
 <a name="gnome-desktop-item-get-strings"></a><h3>gnome_desktop_item_get_strings ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> **             gnome_desktop_item_get_strings      (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting"><span class="returnvalue">char</span> **             gnome_desktop_item_get_strings      (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1650,9 +1647,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_strings ()">
 <a name="gnome-desktop-item-set-strings"></a><h3>gnome_desktop_item_set_strings ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_strings      (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         <span class="returnvalue">char</span> **strings);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_strings      (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> **strings</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1679,8 +1676,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_get_boolean ()">
 <a name="gnome-desktop-item-get-boolean"></a><h3>gnome_desktop_item_get_boolean ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_get_boolean      (const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_item_get_boolean      (<em class="parameter"><code>const <a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1707,9 +1704,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_boolean ()">
 <a name="gnome-desktop-item-set-boolean"></a><h3>gnome_desktop_item_set_boolean ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_boolean      (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *attr,
-                                                         <span class="returnvalue">gboolean</span> value);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_boolean      (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *attr</code></em>,
+                                                         <em class="parameter"><code><span class="type">gboolean</span> value</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1736,8 +1733,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_set_launch_time ()">
 <a name="gnome-desktop-item-set-launch-time"></a><h3>gnome_desktop_item_set_launch_time ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_launch_time  (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         <span class="returnvalue">guint32</span> timestamp);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_set_launch_time  (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint32</span> timestamp</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -1781,8 +1778,8 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_item_clear_section ()">
 <a name="gnome-desktop-item-clear-section"></a><h3>gnome_desktop_item_clear_section ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_clear_section    (<a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="returnvalue">GnomeDesktopItem</span></a> *item,
-                                                         const <span class="returnvalue">char</span> *section);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_item_clear_section    (<em class="parameter"><code><a class="link" href="gnome-desktop-GnomeDesktopItem.html#GnomeDesktopItem" title="GnomeDesktopItem"><span class="type">GnomeDesktopItem</span></a> *item</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *section</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-config.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-config.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-config.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-config.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="GnomeRRLabeler.html" title="GnomeRRLabeler">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -47,25 +42,25 @@
 
 typedef             <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeOutputInfo" title="GnomeOutputInfo">GnomeOutputInfo</a>;
 typedef             <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig">GnomeRRConfig</a>;
-<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-new-current" title="gnome_rr_config_new_current ()">gnome_rr_config_new_current</a>         (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);
-<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-new-stored" title="gnome_rr_config_new_stored ()">gnome_rr_config_new_stored</a>          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-free" title="gnome_rr_config_free ()">gnome_rr_config_free</a>                (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-match" title="gnome_rr_config_match ()">gnome_rr_config_match</a>               (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config1,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config2);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-equal" title="gnome_rr_config_equal ()">gnome_rr_config_equal</a>               (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config1,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config2);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-save" title="gnome_rr_config_save ()">gnome_rr_config_save</a>                (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-sanitize" title="gnome_rr_config_sanitize ()">gnome_rr_config_sanitize</a>            (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-apply" title="gnome_rr_config_apply ()">gnome_rr_config_apply</a>               (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-apply-stored" title="gnome_rr_config_apply_stored ()">gnome_rr_config_apply_stored</a>        (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-applicable" title="gnome_rr_config_applicable ()">gnome_rr_config_applicable</a>          (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);
+<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-new-current" title="gnome_rr_config_new_current ()">gnome_rr_config_new_current</a>         (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-new-stored" title="gnome_rr_config_new_stored ()">gnome_rr_config_new_stored</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-free" title="gnome_rr_config_free ()">gnome_rr_config_free</a>                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-match" title="gnome_rr_config_match ()">gnome_rr_config_match</a>               (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config1</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config2</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-equal" title="gnome_rr_config_equal ()">gnome_rr_config_equal</a>               (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config1</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config2</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-save" title="gnome_rr_config_save ()">gnome_rr_config_save</a>                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-sanitize" title="gnome_rr_config_sanitize ()">gnome_rr_config_sanitize</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-apply" title="gnome_rr_config_apply ()">gnome_rr_config_apply</a>               (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-apply-stored" title="gnome_rr_config_apply_stored ()">gnome_rr_config_apply_stored</a>        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-config.html#gnome-rr-config-applicable" title="gnome_rr_config_applicable ()">gnome_rr_config_applicable</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -93,7 +88,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_new_current ()">
 <a name="gnome-rr-config-new-current"></a><h3>gnome_rr_config_new_current ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     gnome_rr_config_new_current         (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     gnome_rr_config_new_current         (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -115,8 +110,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_new_stored ()">
 <a name="gnome-rr-config-new-stored"></a><h3>gnome_rr_config_new_stored ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     gnome_rr_config_new_stored          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *     gnome_rr_config_new_stored          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -143,7 +138,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_free ()">
 <a name="gnome-rr-config-free"></a><h3>gnome_rr_config_free ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_config_free                (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_config_free                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -158,8 +153,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_match ()">
 <a name="gnome-rr-config-match"></a><h3>gnome_rr_config_match ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_match               (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config1,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config2);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_match               (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config1</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config2</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -186,8 +181,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_equal ()">
 <a name="gnome-rr-config-equal"></a><h3>gnome_rr_config_equal ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_equal               (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config1,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config2);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_equal               (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config1</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config2</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -214,8 +209,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_save ()">
 <a name="gnome-rr-config-save"></a><h3>gnome_rr_config_save ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_save                (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_save                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -242,7 +237,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_sanitize ()">
 <a name="gnome-rr-config-sanitize"></a><h3>gnome_rr_config_sanitize ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_config_sanitize            (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_config_sanitize            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -257,9 +252,9 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_apply ()">
 <a name="gnome-rr-config-apply"></a><h3>gnome_rr_config_apply ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_apply               (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_apply               (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_rr_config_apply</code> is deprecated and should not be used in newly-written code.</p>
@@ -295,8 +290,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_apply_stored ()">
 <a name="gnome-rr-config-apply-stored"></a><h3>gnome_rr_config_apply_stored ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_apply_stored        (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_apply_stored        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_rr_config_apply_stored</code> is deprecated and should not be used in newly-written code.</p>
@@ -314,12 +309,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>screen</code></em> :</span></p></td>
-<td> A <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a>
+<td>A <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> Location to store error, or <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>Location to store error, or <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -333,9 +328,9 @@
 <hr>
 <div class="refsect2" title="gnome_rr_config_applicable ()">
 <a name="gnome-rr-config-applicable"></a><h3>gnome_rr_config_applicable ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_applicable          (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *configuration,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_config_applicable          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *configuration</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-crtc.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-crtc.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-crtc.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-crtc.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-gnome-rr-mode.html" title="gnome-rr-mode">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -47,25 +42,25 @@
 
 typedef             <a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc">GnomeRRCrtc</a>;
 enum                <a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation">GnomeRRRotation</a>;
-<span class="returnvalue">guint32</span>             <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-id" title="gnome_rr_crtc_get_id ()">gnome_rr_crtc_get_id</a>                (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-set-config" title="gnome_rr_crtc_set_config ()">gnome_rr_crtc_set_config</a>            (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <span class="returnvalue">int</span> x,
-                                                         <span class="returnvalue">int</span> y,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a> rotation,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> **outputs,
-                                                         <span class="returnvalue">int</span> n_outputs,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-can-drive-output" title="gnome_rr_crtc_can_drive_output ()">gnome_rr_crtc_can_drive_output</a>      (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-current-mode" title="gnome_rr_crtc_get_current_mode ()">gnome_rr_crtc_get_current_mode</a>      (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-position" title="gnome_rr_crtc_get_position ()">gnome_rr_crtc_get_position</a>          (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <span class="returnvalue">int</span> *x,
-                                                         <span class="returnvalue">int</span> *y);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-supports-rotation" title="gnome_rr_crtc_supports_rotation ()">gnome_rr_crtc_supports_rotation</a>     (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a> rotation);
-<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-current-rotation" title="gnome_rr_crtc_get_current_rotation ()">gnome_rr_crtc_get_current_rotation</a>  (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);
-<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-rotations" title="gnome_rr_crtc_get_rotations ()">gnome_rr_crtc_get_rotations</a>         (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);
+<span class="returnvalue">guint32</span>             <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-id" title="gnome_rr_crtc_get_id ()">gnome_rr_crtc_get_id</a>                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-set-config" title="gnome_rr_crtc_set_config ()">gnome_rr_crtc_set_config</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> x</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> y</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="type">GnomeRRRotation</span></a> rotation</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> **outputs</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> n_outputs</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-can-drive-output" title="gnome_rr_crtc_can_drive_output ()">gnome_rr_crtc_can_drive_output</a>      (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-current-mode" title="gnome_rr_crtc_get_current_mode ()">gnome_rr_crtc_get_current_mode</a>      (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-position" title="gnome_rr_crtc_get_position ()">gnome_rr_crtc_get_position</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *x</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *y</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-supports-rotation" title="gnome_rr_crtc_supports_rotation ()">gnome_rr_crtc_supports_rotation</a>     (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="type">GnomeRRRotation</span></a> rotation</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-current-rotation" title="gnome_rr_crtc_get_current_rotation ()">gnome_rr_crtc_get_current_rotation</a>  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     <a class="link" href="gnome-desktop-gnome-rr-crtc.html#gnome-rr-crtc-get-rotations" title="gnome_rr_crtc_get_rotations ()">gnome_rr_crtc_get_rotations</a>         (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -101,7 +96,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_get_id ()">
 <a name="gnome-rr-crtc-get-id"></a><h3>gnome_rr_crtc_get_id ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint32</span>             gnome_rr_crtc_get_id                (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);</pre>
+<pre class="programlisting"><span class="returnvalue">guint32</span>             gnome_rr_crtc_get_id                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -123,14 +118,14 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_set_config ()">
 <a name="gnome-rr-crtc-set-config"></a><h3>gnome_rr_crtc_set_config ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_crtc_set_config            (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <span class="returnvalue">int</span> x,
-                                                         <span class="returnvalue">int</span> y,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a> rotation,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> **outputs,
-                                                         <span class="returnvalue">int</span> n_outputs,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_crtc_set_config            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> x</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> y</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="type">GnomeRRRotation</span></a> rotation</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> **outputs</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> n_outputs</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <div class="warning" title="Warning" style="margin-left: 0.5in; margin-right: 0.5in;">
 <h3 class="title">Warning</h3>
 <p><code class="literal">gnome_rr_crtc_set_config</code> is deprecated and should not be used in newly-written code.</p>
@@ -191,8 +186,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_can_drive_output ()">
 <a name="gnome-rr-crtc-can-drive-output"></a><h3>gnome_rr_crtc_can_drive_output ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_crtc_can_drive_output      (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_crtc_can_drive_output      (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -219,7 +214,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_get_current_mode ()">
 <a name="gnome-rr-crtc-get-current-mode"></a><h3>gnome_rr_crtc_get_current_mode ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       gnome_rr_crtc_get_current_mode      (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       gnome_rr_crtc_get_current_mode      (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -241,9 +236,9 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_get_position ()">
 <a name="gnome-rr-crtc-get-position"></a><h3>gnome_rr_crtc_get_position ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_crtc_get_position          (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <span class="returnvalue">int</span> *x,
-                                                         <span class="returnvalue">int</span> *y);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_crtc_get_position          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *x</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *y</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -270,8 +265,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_supports_rotation ()">
 <a name="gnome-rr-crtc-supports-rotation"></a><h3>gnome_rr_crtc_supports_rotation ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_crtc_supports_rotation     (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a> rotation);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_crtc_supports_rotation     (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="type">GnomeRRRotation</span></a> rotation</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -298,7 +293,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_get_current_rotation ()">
 <a name="gnome-rr-crtc-get-current-rotation"></a><h3>gnome_rr_crtc_get_current_rotation ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     gnome_rr_crtc_get_current_rotation  (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     gnome_rr_crtc_get_current_rotation  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -320,7 +315,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_crtc_get_rotations ()">
 <a name="gnome-rr-crtc-get-rotations"></a><h3>gnome_rr_crtc_get_rotations ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     gnome_rr_crtc_get_rotations         (<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *crtc);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRRotation" title="enum GnomeRRRotation"><span class="returnvalue">GnomeRRRotation</span></a>     gnome_rr_crtc_get_rotations         (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="type">GnomeRRCrtc</span></a> *crtc</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-mode.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-mode.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-mode.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-mode.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-gnome-rr-config.html" title="gnome-rr-config">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -46,10 +41,10 @@
 #include &lt;libgnomeui/gnome-rr.h&gt;
 
 typedef             <a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode">GnomeRRMode</a>;
-<span class="returnvalue">guint32</span>             <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-id" title="gnome_rr_mode_get_id ()">gnome_rr_mode_get_id</a>                (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);
-<span class="returnvalue">guint</span>               <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-width" title="gnome_rr_mode_get_width ()">gnome_rr_mode_get_width</a>             (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);
-<span class="returnvalue">guint</span>               <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-height" title="gnome_rr_mode_get_height ()">gnome_rr_mode_get_height</a>            (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-freq" title="gnome_rr_mode_get_freq ()">gnome_rr_mode_get_freq</a>              (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);
+<span class="returnvalue">guint32</span>             <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-id" title="gnome_rr_mode_get_id ()">gnome_rr_mode_get_id</a>                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);
+<span class="returnvalue">guint</span>               <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-width" title="gnome_rr_mode_get_width ()">gnome_rr_mode_get_width</a>             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);
+<span class="returnvalue">guint</span>               <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-height" title="gnome_rr_mode_get_height ()">gnome_rr_mode_get_height</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-mode.html#gnome-rr-mode-get-freq" title="gnome_rr_mode_get_freq ()">gnome_rr_mode_get_freq</a>              (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -69,7 +64,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_mode_get_id ()">
 <a name="gnome-rr-mode-get-id"></a><h3>gnome_rr_mode_get_id ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint32</span>             gnome_rr_mode_get_id                (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);</pre>
+<pre class="programlisting"><span class="returnvalue">guint32</span>             gnome_rr_mode_get_id                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -91,7 +86,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_mode_get_width ()">
 <a name="gnome-rr-mode-get-width"></a><h3>gnome_rr_mode_get_width ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>               gnome_rr_mode_get_width             (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);</pre>
+<pre class="programlisting"><span class="returnvalue">guint</span>               gnome_rr_mode_get_width             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -113,7 +108,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_mode_get_height ()">
 <a name="gnome-rr-mode-get-height"></a><h3>gnome_rr_mode_get_height ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint</span>               gnome_rr_mode_get_height            (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);</pre>
+<pre class="programlisting"><span class="returnvalue">guint</span>               gnome_rr_mode_get_height            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -135,7 +130,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_mode_get_freq ()">
 <a name="gnome-rr-mode-get-freq"></a><h3>gnome_rr_mode_get_freq ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_mode_get_freq              (<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_mode_get_freq              (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-output.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-output.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-output.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-output.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-gnome-rr-crtc.html" title="gnome-rr-crtc">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -46,25 +41,25 @@
 #include &lt;libgnomeui/gnome-rr.h&gt;
 
 typedef             <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput">GnomeRROutput</a>;
-<span class="returnvalue">guint32</span>             <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-id" title="gnome_rr_output_get_id ()">gnome_rr_output_get_id</a>              (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-name" title="gnome_rr_output_get_name ()">gnome_rr_output_get_name</a>            (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-is-connected" title="gnome_rr_output_is_connected ()">gnome_rr_output_is_connected</a>        (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-size-inches" title="gnome_rr_output_get_size_inches ()">gnome_rr_output_get_size_inches</a>     (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-width-mm" title="gnome_rr_output_get_width_mm ()">gnome_rr_output_get_width_mm</a>        (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *outout);
-<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-height-mm" title="gnome_rr_output_get_height_mm ()">gnome_rr_output_get_height_mm</a>       (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-const <span class="returnvalue">guint8</span> *      <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-edid-data" title="gnome_rr_output_get_edid_data ()">gnome_rr_output_get_edid_data</a>       (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-possible-crtcs" title="gnome_rr_output_get_possible_crtcs ()">gnome_rr_output_get_possible_crtcs</a>  (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-list-modes" title="gnome_rr_output_list_modes ()">gnome_rr_output_list_modes</a>          (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-current-mode" title="gnome_rr_output_get_current_mode ()">gnome_rr_output_get_current_mode</a>    (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-preferred-mode" title="gnome_rr_output_get_preferred_mode ()">gnome_rr_output_get_preferred_mode</a>  (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-supports-mode" title="gnome_rr_output_supports_mode ()">gnome_rr_output_supports_mode</a>       (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);
-<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-crtc" title="gnome_rr_output_get_crtc ()">gnome_rr_output_get_crtc</a>            (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-position" title="gnome_rr_output_get_position ()">gnome_rr_output_get_position</a>        (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output,
-                                                         <span class="returnvalue">int</span> *x,
-                                                         <span class="returnvalue">int</span> *y);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-can-clone" title="gnome_rr_output_can_clone ()">gnome_rr_output_can_clone</a>           (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *clone);
+<span class="returnvalue">guint32</span>             <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-id" title="gnome_rr_output_get_id ()">gnome_rr_output_get_id</a>              (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+const <span class="returnvalue">char</span> *        <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-name" title="gnome_rr_output_get_name ()">gnome_rr_output_get_name</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-is-connected" title="gnome_rr_output_is_connected ()">gnome_rr_output_is_connected</a>        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-size-inches" title="gnome_rr_output_get_size_inches ()">gnome_rr_output_get_size_inches</a>     (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-width-mm" title="gnome_rr_output_get_width_mm ()">gnome_rr_output_get_width_mm</a>        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *outout</code></em>);
+<span class="returnvalue">int</span>                 <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-height-mm" title="gnome_rr_output_get_height_mm ()">gnome_rr_output_get_height_mm</a>       (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+const <span class="returnvalue">guint8</span> *      <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-edid-data" title="gnome_rr_output_get_edid_data ()">gnome_rr_output_get_edid_data</a>       (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-possible-crtcs" title="gnome_rr_output_get_possible_crtcs ()">gnome_rr_output_get_possible_crtcs</a>  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-list-modes" title="gnome_rr_output_list_modes ()">gnome_rr_output_list_modes</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-current-mode" title="gnome_rr_output_get_current_mode ()">gnome_rr_output_get_current_mode</a>    (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-preferred-mode" title="gnome_rr_output_get_preferred_mode ()">gnome_rr_output_get_preferred_mode</a>  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-supports-mode" title="gnome_rr_output_supports_mode ()">gnome_rr_output_supports_mode</a>       (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-crtc" title="gnome_rr_output_get_crtc ()">gnome_rr_output_get_crtc</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-get-position" title="gnome_rr_output_get_position ()">gnome_rr_output_get_position</a>        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *x</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *y</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-output.html#gnome-rr-output-can-clone" title="gnome_rr_output_can_clone ()">gnome_rr_output_can_clone</a>           (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *clone</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -84,7 +79,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_id ()">
 <a name="gnome-rr-output-get-id"></a><h3>gnome_rr_output_get_id ()</h3>
-<pre class="programlisting"><span class="returnvalue">guint32</span>             gnome_rr_output_get_id              (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><span class="returnvalue">guint32</span>             gnome_rr_output_get_id              (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -106,7 +101,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_name ()">
 <a name="gnome-rr-output-get-name"></a><h3>gnome_rr_output_get_name ()</h3>
-<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_rr_output_get_name            (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting">const <span class="returnvalue">char</span> *        gnome_rr_output_get_name            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -128,7 +123,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_is_connected ()">
 <a name="gnome-rr-output-is-connected"></a><h3>gnome_rr_output_is_connected ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_output_is_connected        (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_output_is_connected        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -150,7 +145,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_size_inches ()">
 <a name="gnome-rr-output-get-size-inches"></a><h3>gnome_rr_output_get_size_inches ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_output_get_size_inches     (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_output_get_size_inches     (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -172,7 +167,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_width_mm ()">
 <a name="gnome-rr-output-get-width-mm"></a><h3>gnome_rr_output_get_width_mm ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_output_get_width_mm        (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *outout);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_output_get_width_mm        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *outout</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -194,7 +189,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_height_mm ()">
 <a name="gnome-rr-output-get-height-mm"></a><h3>gnome_rr_output_get_height_mm ()</h3>
-<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_output_get_height_mm       (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><span class="returnvalue">int</span>                 gnome_rr_output_get_height_mm       (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -216,7 +211,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_edid_data ()">
 <a name="gnome-rr-output-get-edid-data"></a><h3>gnome_rr_output_get_edid_data ()</h3>
-<pre class="programlisting">const <span class="returnvalue">guint8</span> *      gnome_rr_output_get_edid_data       (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting">const <span class="returnvalue">guint8</span> *      gnome_rr_output_get_edid_data       (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -238,7 +233,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_possible_crtcs ()">
 <a name="gnome-rr-output-get-possible-crtcs"></a><h3>gnome_rr_output_get_possible_crtcs ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      gnome_rr_output_get_possible_crtcs  (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      gnome_rr_output_get_possible_crtcs  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -260,7 +255,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_list_modes ()">
 <a name="gnome-rr-output-list-modes"></a><h3>gnome_rr_output_list_modes ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      gnome_rr_output_list_modes          (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      gnome_rr_output_list_modes          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -282,7 +277,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_current_mode ()">
 <a name="gnome-rr-output-get-current-mode"></a><h3>gnome_rr_output_get_current_mode ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       gnome_rr_output_get_current_mode    (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       gnome_rr_output_get_current_mode    (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -304,7 +299,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_preferred_mode ()">
 <a name="gnome-rr-output-get-preferred-mode"></a><h3>gnome_rr_output_get_preferred_mode ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       gnome_rr_output_get_preferred_mode  (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *       gnome_rr_output_get_preferred_mode  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -326,8 +321,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_supports_mode ()">
 <a name="gnome-rr-output-supports-mode"></a><h3>gnome_rr_output_supports_mode ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_output_supports_mode       (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> *mode);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_output_supports_mode       (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="type">GnomeRRMode</span></a> *mode</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -354,7 +349,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_crtc ()">
 <a name="gnome-rr-output-get-crtc"></a><h3>gnome_rr_output_get_crtc ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       gnome_rr_output_get_crtc            (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       gnome_rr_output_get_crtc            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -376,9 +371,9 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_get_position ()">
 <a name="gnome-rr-output-get-position"></a><h3>gnome_rr_output_get_position ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_output_get_position        (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output,
-                                                         <span class="returnvalue">int</span> *x,
-                                                         <span class="returnvalue">int</span> *y);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_output_get_position        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *x</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *y</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -405,8 +400,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_output_can_clone ()">
 <a name="gnome-rr-output-can-clone"></a><h3>gnome_rr_output_can_clone ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_output_can_clone           (<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *output,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *clone);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_output_can_clone           (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="type">GnomeRROutput</span></a> *clone</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-screen.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-screen.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-screen.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-gnome-rr-screen.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-gnome-rr-output.html" title="gnome-rr-output">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -46,35 +41,35 @@
 #include &lt;libgnomeui/gnome-rr.h&gt;
 
 typedef             <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen">GnomeRRScreen</a>;
-<span class="returnvalue">void</span>                (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreenChanged" title="GnomeRRScreenChanged ()">*GnomeRRScreenChanged</a>)             (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">gpointer</span> data);
-<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-new" title="gnome_rr_screen_new ()">gnome_rr_screen_new</a>                 (<span class="returnvalue">GdkScreen</span> *screen,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreenChanged" title="GnomeRRScreenChanged ()"><span class="returnvalue">GnomeRRScreenChanged</span></a> callback,
-                                                         <span class="returnvalue">gpointer</span> data,
-                                                         <span class="returnvalue">GError</span> **error);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-destroy" title="gnome_rr_screen_destroy ()">gnome_rr_screen_destroy</a>             (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-refresh" title="gnome_rr_screen_refresh ()">gnome_rr_screen_refresh</a>             (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);
-<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> **    <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-outputs" title="gnome_rr_screen_list_outputs ()">gnome_rr_screen_list_outputs</a>        (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);
-<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-crtcs" title="gnome_rr_screen_list_crtcs ()">gnome_rr_screen_list_crtcs</a>          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);
-<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-modes" title="gnome_rr_screen_list_modes ()">gnome_rr_screen_list_modes</a>          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);
-<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-clone-modes" title="gnome_rr_screen_list_clone_modes ()">gnome_rr_screen_list_clone_modes</a>    (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-set-size" title="gnome_rr_screen_set_size ()">gnome_rr_screen_set_size</a>            (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">int</span> width,
-                                                         <span class="returnvalue">int</span> height,
-                                                         <span class="returnvalue">int</span> mm_width,
-                                                         <span class="returnvalue">int</span> mm_height);
-<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-output-by-id" title="gnome_rr_screen_get_output_by_id ()">gnome_rr_screen_get_output_by_id</a>    (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">guint32</span> id);
-<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-output-by-name" title="gnome_rr_screen_get_output_by_name ()">gnome_rr_screen_get_output_by_name</a>  (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         const <span class="returnvalue">char</span> *name);
-<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-crtc-by-id" title="gnome_rr_screen_get_crtc_by_id ()">gnome_rr_screen_get_crtc_by_id</a>      (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">guint32</span> id);
-<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-ranges" title="gnome_rr_screen_get_ranges ()">gnome_rr_screen_get_ranges</a>          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">int</span> *min_width,
-                                                         <span class="returnvalue">int</span> *max_width,
-                                                         <span class="returnvalue">int</span> *min_height,
-                                                         <span class="returnvalue">int</span> *max_height);
+<span class="returnvalue">void</span>                (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreenChanged" title="GnomeRRScreenChanged ()">*GnomeRRScreenChanged</a>)             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">gpointer</span> data</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-new" title="gnome_rr_screen_new ()">gnome_rr_screen_new</a>                 (<em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreenChanged" title="GnomeRRScreenChanged ()"><span class="type">GnomeRRScreenChanged</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><span class="type">gpointer</span> data</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-destroy" title="gnome_rr_screen_destroy ()">gnome_rr_screen_destroy</a>             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-refresh" title="gnome_rr_screen_refresh ()">gnome_rr_screen_refresh</a>             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> **    <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-outputs" title="gnome_rr_screen_list_outputs ()">gnome_rr_screen_list_outputs</a>        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-crtcs" title="gnome_rr_screen_list_crtcs ()">gnome_rr_screen_list_crtcs</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-modes" title="gnome_rr_screen_list_modes ()">gnome_rr_screen_list_modes</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-list-clone-modes" title="gnome_rr_screen_list_clone_modes ()">gnome_rr_screen_list_clone_modes</a>    (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-set-size" title="gnome_rr_screen_set_size ()">gnome_rr_screen_set_size</a>            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> height</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> mm_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> mm_height</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-output-by-id" title="gnome_rr_screen_get_output_by_id ()">gnome_rr_screen_get_output_by_id</a>    (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint32</span> id</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-output-by-name" title="gnome_rr_screen_get_output_by_name ()">gnome_rr_screen_get_output_by_name</a>  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);
+<a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-crtc-by-id" title="gnome_rr_screen_get_crtc_by_id ()">gnome_rr_screen_get_crtc_by_id</a>      (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint32</span> id</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-gnome-rr-screen.html#gnome-rr-screen-get-ranges" title="gnome_rr_screen_get_ranges ()">gnome_rr_screen_get_ranges</a>          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *min_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *max_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *min_height</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *max_height</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -94,8 +89,8 @@
 <hr>
 <div class="refsect2" title="GnomeRRScreenChanged ()">
 <a name="GnomeRRScreenChanged"></a><h3>GnomeRRScreenChanged ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                (*GnomeRRScreenChanged)             (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">gpointer</span> data);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                (*GnomeRRScreenChanged)             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">gpointer</span> data</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -117,10 +112,10 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_new ()">
 <a name="gnome-rr-screen-new"></a><h3>gnome_rr_screen_new ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *     gnome_rr_screen_new                 (<span class="returnvalue">GdkScreen</span> *screen,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreenChanged" title="GnomeRRScreenChanged ()"><span class="returnvalue">GnomeRRScreenChanged</span></a> callback,
-                                                         <span class="returnvalue">gpointer</span> data,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *     gnome_rr_screen_new                 (<em class="parameter"><code><span class="type">GdkScreen</span> *screen</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreenChanged" title="GnomeRRScreenChanged ()"><span class="type">GnomeRRScreenChanged</span></a> callback</code></em>,
+                                                         <em class="parameter"><code><span class="type">gpointer</span> data</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -157,7 +152,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_destroy ()">
 <a name="gnome-rr-screen-destroy"></a><h3>gnome_rr_screen_destroy ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_screen_destroy             (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_screen_destroy             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -172,8 +167,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_refresh ()">
 <a name="gnome-rr-screen-refresh"></a><h3>gnome_rr_screen_refresh ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_screen_refresh             (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">GError</span> **error);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_rr_screen_refresh             (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">GError</span> **error</code></em>);</pre>
 <p>
 Refreshes the screen configuration, and calls the screen's callback if it
 exists and if the screen's configuration changed.</p>
@@ -182,12 +177,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>screen</code></em> :</span></p></td>
-<td> a <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a>
+<td>a <a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>error</code></em> :</span></p></td>
-<td> location to store error, or <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
+<td>location to store error, or <a href="/gnome/usr/share/gtk-doc/html/liboil/liboil-liboiljunk.html#NULL:CAPS"><code class="literal">NULL</code></a>
 </td>
 </tr>
 <tr>
@@ -204,7 +199,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_list_outputs ()">
 <a name="gnome-rr-screen-list-outputs"></a><h3>gnome_rr_screen_list_outputs ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> **    gnome_rr_screen_list_outputs        (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> **    gnome_rr_screen_list_outputs        (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -226,7 +221,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_list_crtcs ()">
 <a name="gnome-rr-screen-list-crtcs"></a><h3>gnome_rr_screen_list_crtcs ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      gnome_rr_screen_list_crtcs          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> **      gnome_rr_screen_list_crtcs          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -248,7 +243,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_list_modes ()">
 <a name="gnome-rr-screen-list-modes"></a><h3>gnome_rr_screen_list_modes ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      gnome_rr_screen_list_modes          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      gnome_rr_screen_list_modes          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -270,7 +265,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_list_clone_modes ()">
 <a name="gnome-rr-screen-list-clone-modes"></a><h3>gnome_rr_screen_list_clone_modes ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      gnome_rr_screen_list_clone_modes    (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-mode.html#GnomeRRMode" title="GnomeRRMode"><span class="returnvalue">GnomeRRMode</span></a> **      gnome_rr_screen_list_clone_modes    (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -292,11 +287,11 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_set_size ()">
 <a name="gnome-rr-screen-set-size"></a><h3>gnome_rr_screen_set_size ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_screen_set_size            (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">int</span> width,
-                                                         <span class="returnvalue">int</span> height,
-                                                         <span class="returnvalue">int</span> mm_width,
-                                                         <span class="returnvalue">int</span> mm_height);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_screen_set_size            (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> height</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> mm_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> mm_height</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -333,8 +328,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_get_output_by_id ()">
 <a name="gnome-rr-screen-get-output-by-id"></a><h3>gnome_rr_screen_get_output_by_id ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     gnome_rr_screen_get_output_by_id    (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">guint32</span> id);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     gnome_rr_screen_get_output_by_id    (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint32</span> id</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -361,8 +356,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_get_output_by_name ()">
 <a name="gnome-rr-screen-get-output-by-name"></a><h3>gnome_rr_screen_get_output_by_name ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     gnome_rr_screen_get_output_by_name  (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         const <span class="returnvalue">char</span> *name);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-output.html#GnomeRROutput" title="GnomeRROutput"><span class="returnvalue">GnomeRROutput</span></a> *     gnome_rr_screen_get_output_by_name  (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *name</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -389,8 +384,8 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_get_crtc_by_id ()">
 <a name="gnome-rr-screen-get-crtc-by-id"></a><h3>gnome_rr_screen_get_crtc_by_id ()</h3>
-<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       gnome_rr_screen_get_crtc_by_id      (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">guint32</span> id);</pre>
+<pre class="programlisting"><a class="link" href="gnome-desktop-gnome-rr-crtc.html#GnomeRRCrtc" title="GnomeRRCrtc"><span class="returnvalue">GnomeRRCrtc</span></a> *       gnome_rr_screen_get_crtc_by_id      (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">guint32</span> id</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -417,11 +412,11 @@
 <hr>
 <div class="refsect2" title="gnome_rr_screen_get_ranges ()">
 <a name="gnome-rr-screen-get-ranges"></a><h3>gnome_rr_screen_get_ranges ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_screen_get_ranges          (<a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="returnvalue">GnomeRRScreen</span></a> *screen,
-                                                         <span class="returnvalue">int</span> *min_width,
-                                                         <span class="returnvalue">int</span> *max_width,
-                                                         <span class="returnvalue">int</span> *min_height,
-                                                         <span class="returnvalue">int</span> *max_height);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_screen_get_ranges          (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-screen.html#GnomeRRScreen" title="GnomeRRScreen"><span class="type">GnomeRRScreen</span></a> *screen</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *min_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *max_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *min_height</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> *max_height</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Functions.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Functions.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Functions.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Functions.html	2010-06-22 03:43:07.000000000 +0200
@@ -9,11 +9,6 @@
 <link rel="prev" href="gnome-desktop-GnomeDesktopItem.html" title="GnomeDesktopItem">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -45,8 +40,8 @@
 #include &lt;libgnome/gnome-desktop-utils.h&gt;
 
 <span class="returnvalue">void</span>                <a class="link" href="gnome-desktop-Miscellaneous-Functions.html#gnome-desktop-prepend-terminal-to-vector" title="gnome_desktop_prepend_terminal_to_vector ()">gnome_desktop_prepend_terminal_to_vector</a>
-                                                        (<span class="returnvalue">int</span> *argc,
-                                                         <span class="returnvalue">char</span> ***argv);
+                                                        (<em class="parameter"><code><span class="type">int</span> *argc</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> ***argv</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -59,8 +54,8 @@
 <div class="refsect2" title="gnome_desktop_prepend_terminal_to_vector ()">
 <a name="gnome-desktop-prepend-terminal-to-vector"></a><h3>gnome_desktop_prepend_terminal_to_vector ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_prepend_terminal_to_vector
-                                                        (<span class="returnvalue">int</span> *argc,
-                                                         <span class="returnvalue">char</span> ***argv);</pre>
+                                                        (<em class="parameter"><code><span class="type">int</span> *argc</code></em>,
+                                                         <em class="parameter"><code><span class="type">char</span> ***argv</code></em>);</pre>
 <p>
 Prepends a terminal (either the one configured as default in
 the user's GNOME setup, or one of the common xterm emulators) to the passed
@@ -75,12 +70,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>argc</code></em> :</span></p></td>
-<td> a pointer to the vector size
+<td>a pointer to the vector size
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>argv</code></em> :</span></p></td>
-<td> a pointer to the vector
+<td>a pointer to the vector
 </td>
 </tr>
 </tbody>
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Thumbnail-Functions.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Thumbnail-Functions.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Thumbnail-Functions.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/gnome-desktop-Miscellaneous-Thumbnail-Functions.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="libgnome.html" title="Part V. Miscellaneous">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -45,19 +40,19 @@
 <pre class="synopsis">
 #include &lt;libgnomeui/gnome-thumbnail.h&gt;
 
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-has-uri" title="gnome_desktop_thumbnail_has_uri ()">gnome_desktop_thumbnail_has_uri</a>     (<span class="returnvalue">GdkPixbuf</span> *pixbuf,
-                                                         const <span class="returnvalue">char</span> *uri);
-<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-is-valid" title="gnome_desktop_thumbnail_is_valid ()">gnome_desktop_thumbnail_is_valid</a>    (<span class="returnvalue">GdkPixbuf</span> *pixbuf,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);
-<span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-md5" title="gnome_desktop_thumbnail_md5 ()">gnome_desktop_thumbnail_md5</a>         (const <span class="returnvalue">char</span> *uri);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-has-uri" title="gnome_desktop_thumbnail_has_uri ()">gnome_desktop_thumbnail_has_uri</a>     (<em class="parameter"><code><span class="type">GdkPixbuf</span> *pixbuf</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>);
+<span class="returnvalue">gboolean</span>            <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-is-valid" title="gnome_desktop_thumbnail_is_valid ()">gnome_desktop_thumbnail_is_valid</a>    (<em class="parameter"><code><span class="type">GdkPixbuf</span> *pixbuf</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);
+<span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-md5" title="gnome_desktop_thumbnail_md5 ()">gnome_desktop_thumbnail_md5</a>         (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>);
 <span class="returnvalue">char</span> *              <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-path-for-uri" title="gnome_desktop_thumbnail_path_for_uri ()">gnome_desktop_thumbnail_path_for_uri</a>
-                                                        (const <span class="returnvalue">char</span> *uri,
-                                                         <a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="returnvalue">GnomeDesktopThumbnailSize</span></a> size);
+                                                        (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="type">GnomeDesktopThumbnailSize</span></a> size</code></em>);
 <span class="returnvalue">GdkPixbuf</span> *         <a class="link" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html#gnome-desktop-thumbnail-scale-down-pixbuf" title="gnome_desktop_thumbnail_scale_down_pixbuf ()">gnome_desktop_thumbnail_scale_down_pixbuf</a>
-                                                        (<span class="returnvalue">GdkPixbuf</span> *pixbuf,
-                                                         <span class="returnvalue">int</span> dest_width,
-                                                         <span class="returnvalue">int</span> dest_height);
+                                                        (<em class="parameter"><code><span class="type">GdkPixbuf</span> *pixbuf</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_height</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Description">
@@ -69,8 +64,8 @@
 <a name="gnome-desktop-Miscellaneous-Thumbnail-Functions.details"></a><h2>Details</h2>
 <div class="refsect2" title="gnome_desktop_thumbnail_has_uri ()">
 <a name="gnome-desktop-thumbnail-has-uri"></a><h3>gnome_desktop_thumbnail_has_uri ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_thumbnail_has_uri     (<span class="returnvalue">GdkPixbuf</span> *pixbuf,
-                                                         const <span class="returnvalue">char</span> *uri);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_thumbnail_has_uri     (<em class="parameter"><code><span class="type">GdkPixbuf</span> *pixbuf</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>);</pre>
 <p>
 Returns whether the thumbnail has the correct uri embedded in the
 Thumb::URI option in the png.</p>
@@ -79,12 +74,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>pixbuf</code></em> :</span></p></td>
-<td> an loaded thumbnail pixbuf
+<td>an loaded thumbnail pixbuf
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> a uri
+<td>a uri
 </td>
 </tr>
 <tr>
@@ -100,9 +95,9 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_thumbnail_is_valid ()">
 <a name="gnome-desktop-thumbnail-is-valid"></a><h3>gnome_desktop_thumbnail_is_valid ()</h3>
-<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_thumbnail_is_valid    (<span class="returnvalue">GdkPixbuf</span> *pixbuf,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);</pre>
+<pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_thumbnail_is_valid    (<em class="parameter"><code><span class="type">GdkPixbuf</span> *pixbuf</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);</pre>
 <p>
 Returns whether the thumbnail has the correct uri and mtime embedded in the
 png options.</p>
@@ -111,17 +106,17 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>pixbuf</code></em> :</span></p></td>
-<td> an loaded thumbnail <span class="type">GdkPixbuf</span>
+<td>an loaded thumbnail <span class="type">GdkPixbuf</span>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> a uri
+<td>a uri
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mtime</code></em> :</span></p></td>
-<td> the mtime
+<td>the mtime
 </td>
 </tr>
 <tr>
@@ -137,7 +132,7 @@
 <hr>
 <div class="refsect2" title="gnome_desktop_thumbnail_md5 ()">
 <a name="gnome-desktop-thumbnail-md5"></a><h3>gnome_desktop_thumbnail_md5 ()</h3>
-<pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_thumbnail_md5         (const <span class="returnvalue">char</span> *uri);</pre>
+<pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_thumbnail_md5         (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>);</pre>
 <p>
 Calculates the MD5 checksum of the uri. This can be useful
 if you want to manually handle thumbnail files.</p>
@@ -146,7 +141,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> an uri
+<td>an uri
 </td>
 </tr>
 <tr>
@@ -163,8 +158,8 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_path_for_uri ()">
 <a name="gnome-desktop-thumbnail-path-for-uri"></a><h3>gnome_desktop_thumbnail_path_for_uri ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_thumbnail_path_for_uri
-                                                        (const <span class="returnvalue">char</span> *uri,
-                                                         <a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="returnvalue">GnomeDesktopThumbnailSize</span></a> size);</pre>
+                                                        (<em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="type">GnomeDesktopThumbnailSize</span></a> size</code></em>);</pre>
 <p>
 Returns the filename that a thumbnail of size <em class="parameter"><code>size</code></em> for <em class="parameter"><code>uri</code></em> would have.</p>
 <div class="variablelist"><table border="0">
@@ -172,12 +167,12 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> an uri
+<td>an uri
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td>
-<td> a thumbnail size
+<td>a thumbnail size
 </td>
 </tr>
 <tr>
@@ -194,9 +189,9 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_scale_down_pixbuf ()">
 <a name="gnome-desktop-thumbnail-scale-down-pixbuf"></a><h3>gnome_desktop_thumbnail_scale_down_pixbuf ()</h3>
 <pre class="programlisting"><span class="returnvalue">GdkPixbuf</span> *         gnome_desktop_thumbnail_scale_down_pixbuf
-                                                        (<span class="returnvalue">GdkPixbuf</span> *pixbuf,
-                                                         <span class="returnvalue">int</span> dest_width,
-                                                         <span class="returnvalue">int</span> dest_height);</pre>
+                                                        (<em class="parameter"><code><span class="type">GdkPixbuf</span> *pixbuf</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_width</code></em>,
+                                                         <em class="parameter"><code><span class="type">int</span> dest_height</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/GnomeDesktopThumbnailFactory.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/GnomeDesktopThumbnailFactory.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/GnomeDesktopThumbnailFactory.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/GnomeDesktopThumbnailFactory.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-Miscellaneous-Thumbnail-Functions.html" title="Miscellaneous Thumbnail Functions">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -50,33 +45,33 @@
                     <a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailFactory-struct" title="GnomeDesktopThumbnailFactory">GnomeDesktopThumbnailFactory</a>;
 enum                <a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize">GnomeDesktopThumbnailSize</a>;
 <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> * <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-new" title="gnome_desktop_thumbnail_factory_new ()">gnome_desktop_thumbnail_factory_new</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="returnvalue">GnomeDesktopThumbnailSize</span></a> size);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="type">GnomeDesktopThumbnailSize</span></a> size</code></em>);
 <span class="returnvalue">char</span> *              <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-lookup" title="gnome_desktop_thumbnail_factory_lookup ()">gnome_desktop_thumbnail_factory_lookup</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);
 <span class="returnvalue">gboolean</span>            <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-has-valid-failed-thumbnail" title="gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail ()">gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);
 <span class="returnvalue">gboolean</span>            <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-can-thumbnail" title="gnome_desktop_thumbnail_factory_can_thumbnail ()">gnome_desktop_thumbnail_factory_can_thumbnail</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         const <span class="returnvalue">char</span> *mime_type,
-                                                         <span class="returnvalue">time_t</span> mtime);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *mime_type</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);
 <span class="returnvalue">GdkPixbuf</span> *         <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-generate-thumbnail" title="gnome_desktop_thumbnail_factory_generate_thumbnail ()">gnome_desktop_thumbnail_factory_generate_thumbnail</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         const <span class="returnvalue">char</span> *mime_type);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *mime_type</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-save-thumbnail" title="gnome_desktop_thumbnail_factory_save_thumbnail ()">gnome_desktop_thumbnail_factory_save_thumbnail</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         <span class="returnvalue">GdkPixbuf</span> *thumbnail,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> original_mtime);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkPixbuf</span> *thumbnail</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> original_mtime</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="GnomeDesktopThumbnailFactory.html#gnome-desktop-thumbnail-factory-create-failed-thumbnail" title="gnome_desktop_thumbnail_factory_create_failed_thumbnail ()">gnome_desktop_thumbnail_factory_create_failed_thumbnail</a>
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
@@ -114,7 +109,7 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_new ()">
 <a name="gnome-desktop-thumbnail-factory-new"></a><h3>gnome_desktop_thumbnail_factory_new ()</h3>
 <pre class="programlisting"><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> * gnome_desktop_thumbnail_factory_new
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="returnvalue">GnomeDesktopThumbnailSize</span></a> size);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html#GnomeDesktopThumbnailSize" title="enum GnomeDesktopThumbnailSize"><span class="type">GnomeDesktopThumbnailSize</span></a> size</code></em>);</pre>
 <p>
 Creates a new <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>.
 </p>
@@ -125,7 +120,7 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td>
-<td> The thumbnail size to use
+<td>The thumbnail size to use
 </td>
 </tr>
 <tr>
@@ -142,9 +137,9 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_lookup ()">
 <a name="gnome-desktop-thumbnail-factory-lookup"></a><h3>gnome_desktop_thumbnail_factory_lookup ()</h3>
 <pre class="programlisting"><span class="returnvalue">char</span> *              gnome_desktop_thumbnail_factory_lookup
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);</pre>
 <p>
 Tries to locate an existing thumbnail for the file specified.
 </p>
@@ -155,17 +150,17 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>factory</code></em> :</span></p></td>
-<td> a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
+<td>a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> the uri of a file
+<td>the uri of a file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mtime</code></em> :</span></p></td>
-<td> the mtime of the file
+<td>the mtime of the file
 </td>
 </tr>
 <tr>
@@ -182,9 +177,9 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail ()">
 <a name="gnome-desktop-thumbnail-factory-has-valid-failed-thumbnail"></a><h3>gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_thumbnail_factory_has_valid_failed_thumbnail
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);</pre>
 <p>
 Tries to locate an failed thumbnail for the file specified. Writing
 and looking for failed thumbnails is important to avoid to try to
@@ -197,17 +192,17 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>factory</code></em> :</span></p></td>
-<td> a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
+<td>a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> the uri of a file
+<td>the uri of a file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mtime</code></em> :</span></p></td>
-<td> the mtime of the file
+<td>the mtime of the file
 </td>
 </tr>
 <tr>
@@ -224,10 +219,10 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_can_thumbnail ()">
 <a name="gnome-desktop-thumbnail-factory-can-thumbnail"></a><h3>gnome_desktop_thumbnail_factory_can_thumbnail ()</h3>
 <pre class="programlisting"><span class="returnvalue">gboolean</span>            gnome_desktop_thumbnail_factory_can_thumbnail
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         const <span class="returnvalue">char</span> *mime_type,
-                                                         <span class="returnvalue">time_t</span> mtime);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *mime_type</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);</pre>
 <p>
 Returns TRUE if this GnomeIconFactory can (at least try) to thumbnail
 this file. Thumbnails or files with failed thumbnails won't be thumbnailed.
@@ -239,22 +234,22 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>factory</code></em> :</span></p></td>
-<td> a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
+<td>a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> the uri of a file
+<td>the uri of a file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mime_type</code></em> :</span></p></td>
-<td> the mime type of the file
+<td>the mime type of the file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mtime</code></em> :</span></p></td>
-<td> the mtime of the file
+<td>the mtime of the file
 </td>
 </tr>
 <tr>
@@ -271,9 +266,9 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_generate_thumbnail ()">
 <a name="gnome-desktop-thumbnail-factory-generate-thumbnail"></a><h3>gnome_desktop_thumbnail_factory_generate_thumbnail ()</h3>
 <pre class="programlisting"><span class="returnvalue">GdkPixbuf</span> *         gnome_desktop_thumbnail_factory_generate_thumbnail
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         const <span class="returnvalue">char</span> *mime_type);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *mime_type</code></em>);</pre>
 <p>
 Tries to generate a thumbnail for the specified file. If it succeeds
 it returns a pixbuf that can be used as a thumbnail.
@@ -285,17 +280,17 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>factory</code></em> :</span></p></td>
-<td> a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
+<td>a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> the uri of a file
+<td>the uri of a file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mime_type</code></em> :</span></p></td>
-<td> the mime type of the file
+<td>the mime type of the file
 </td>
 </tr>
 <tr>
@@ -312,10 +307,10 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_save_thumbnail ()">
 <a name="gnome-desktop-thumbnail-factory-save-thumbnail"></a><h3>gnome_desktop_thumbnail_factory_save_thumbnail ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_thumbnail_factory_save_thumbnail
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         <span class="returnvalue">GdkPixbuf</span> *thumbnail,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> original_mtime);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkPixbuf</span> *thumbnail</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> original_mtime</code></em>);</pre>
 <p>
 Saves <em class="parameter"><code>thumbnail</code></em> at the right place. If the save fails a
 failed thumbnail is written.
@@ -327,22 +322,22 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>factory</code></em> :</span></p></td>
-<td> a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
+<td>a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>thumbnail</code></em> :</span></p></td>
-<td> the thumbnail as a pixbuf 
+<td>the thumbnail as a pixbuf 
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> the uri of a file
+<td>the uri of a file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>original_mtime</code></em> :</span></p></td>
-<td> the modification time of the original file 
+<td>the modification time of the original file 
 </td>
 </tr>
 </tbody>
@@ -353,9 +348,9 @@
 <div class="refsect2" title="gnome_desktop_thumbnail_factory_create_failed_thumbnail ()">
 <a name="gnome-desktop-thumbnail-factory-create-failed-thumbnail"></a><h3>gnome_desktop_thumbnail_factory_create_failed_thumbnail ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_desktop_thumbnail_factory_create_failed_thumbnail
-                                                        (<a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="returnvalue">GnomeDesktopThumbnailFactory</span></a> *factory,
-                                                         const <span class="returnvalue">char</span> *uri,
-                                                         <span class="returnvalue">time_t</span> mtime);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a> *factory</code></em>,
+                                                         <em class="parameter"><code>const <span class="type">char</span> *uri</code></em>,
+                                                         <em class="parameter"><code><span class="type">time_t</span> mtime</code></em>);</pre>
 <p>
 Creates a failed thumbnail for the file so that we don't try
 to re-thumbnail the file later.
@@ -367,17 +362,17 @@
 <tbody>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>factory</code></em> :</span></p></td>
-<td> a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
+<td>a <a class="link" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory"><span class="type">GnomeDesktopThumbnailFactory</span></a>
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>uri</code></em> :</span></p></td>
-<td> the uri of a file
+<td>the uri of a file
 </td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>mtime</code></em> :</span></p></td>
-<td> the modification time of the file
+<td>the modification time of the file
 </td>
 </tr>
 </tbody>
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/GnomeRRLabeler.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/GnomeRRLabeler.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/GnomeRRLabeler.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/GnomeRRLabeler.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="thumbnail.html" title="Part IV. Thumbnails">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2">
@@ -48,12 +43,12 @@
 #include &lt;libgnomeui/gnome-rr-labeler.h&gt;
 
                     <a class="link" href="GnomeRRLabeler.html#GnomeRRLabeler-struct" title="GnomeRRLabeler">GnomeRRLabeler</a>;
-<a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *    <a class="link" href="GnomeRRLabeler.html#gnome-rr-labeler-new" title="gnome_rr_labeler_new ()">gnome_rr_labeler_new</a>                (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config);
-<span class="returnvalue">void</span>                <a class="link" href="GnomeRRLabeler.html#gnome-rr-labeler-hide" title="gnome_rr_labeler_hide ()">gnome_rr_labeler_hide</a>               (<a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *labeler);
+<a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *    <a class="link" href="GnomeRRLabeler.html#gnome-rr-labeler-new" title="gnome_rr_labeler_new ()">gnome_rr_labeler_new</a>                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config</code></em>);
+<span class="returnvalue">void</span>                <a class="link" href="GnomeRRLabeler.html#gnome-rr-labeler-hide" title="gnome_rr_labeler_hide ()">gnome_rr_labeler_hide</a>               (<em class="parameter"><code><a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="type">GnomeRRLabeler</span></a> *labeler</code></em>);
 <span class="returnvalue">void</span>                <a class="link" href="GnomeRRLabeler.html#gnome-rr-labeler-get-color-for-output" title="gnome_rr_labeler_get_color_for_output ()">gnome_rr_labeler_get_color_for_output</a>
-                                                        (<a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *labeler,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeOutputInfo" title="GnomeOutputInfo"><span class="returnvalue">GnomeOutputInfo</span></a> *output,
-                                                         <span class="returnvalue">GdkColor</span> *color_out);
+                                                        (<em class="parameter"><code><a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="type">GnomeRRLabeler</span></a> *labeler</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeOutputInfo" title="GnomeOutputInfo"><span class="type">GnomeOutputInfo</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *color_out</code></em>);
 </pre>
 </div>
 <div class="refsect1" title="Object Hierarchy">
@@ -79,7 +74,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_labeler_new ()">
 <a name="gnome-rr-labeler-new"></a><h3>gnome_rr_labeler_new ()</h3>
-<pre class="programlisting"><a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *    gnome_rr_labeler_new                (<a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="returnvalue">GnomeRRConfig</span></a> *config);</pre>
+<pre class="programlisting"><a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *    gnome_rr_labeler_new                (<em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeRRConfig" title="GnomeRRConfig"><span class="type">GnomeRRConfig</span></a> *config</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -101,7 +96,7 @@
 <hr>
 <div class="refsect2" title="gnome_rr_labeler_hide ()">
 <a name="gnome-rr-labeler-hide"></a><h3>gnome_rr_labeler_hide ()</h3>
-<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_labeler_hide               (<a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *labeler);</pre>
+<pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_labeler_hide               (<em class="parameter"><code><a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="type">GnomeRRLabeler</span></a> *labeler</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
@@ -117,9 +112,9 @@
 <div class="refsect2" title="gnome_rr_labeler_get_color_for_output ()">
 <a name="gnome-rr-labeler-get-color-for-output"></a><h3>gnome_rr_labeler_get_color_for_output ()</h3>
 <pre class="programlisting"><span class="returnvalue">void</span>                gnome_rr_labeler_get_color_for_output
-                                                        (<a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="returnvalue">GnomeRRLabeler</span></a> *labeler,
-                                                         <a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeOutputInfo" title="GnomeOutputInfo"><span class="returnvalue">GnomeOutputInfo</span></a> *output,
-                                                         <span class="returnvalue">GdkColor</span> *color_out);</pre>
+                                                        (<em class="parameter"><code><a class="link" href="GnomeRRLabeler.html" title="GnomeRRLabeler"><span class="type">GnomeRRLabeler</span></a> *labeler</code></em>,
+                                                         <em class="parameter"><code><a class="link" href="gnome-desktop-gnome-rr-config.html#GnomeOutputInfo" title="GnomeOutputInfo"><span class="type">GnomeOutputInfo</span></a> *output</code></em>,
+                                                         <em class="parameter"><code><span class="type">GdkColor</span> *color_out</code></em>);</pre>
 <p>
 </p>
 <div class="variablelist"><table border="0">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/index.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/index.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/index.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/index.html	2010-06-22 03:43:07.000000000 +0200
@@ -8,11 +8,6 @@
 <link rel="next" href="intro.html" title="Part I. GNOME Desktop Library Overview">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <div class="book" title="GNOME Desktop Library Reference Manual">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/intro.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/intro.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/intro.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/intro.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="background.html" title="Part II. Desktop Background">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/libgnome.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/libgnome.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/libgnome.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/libgnome.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-GnomeDesktopItem.html" title="GnomeDesktopItem">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/randr.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/randr.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/randr.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/randr.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="gnome-desktop-gnome-rr-screen.html" title="gnome-rr-screen">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/style.css gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/style.css
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/style.css	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/style.css	2010-06-22 03:43:07.000000000 +0200
@@ -211,19 +211,19 @@
 
 /* code listings */
 
-.programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
-.programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
-.programlisting .function   { color: #000000; font-weight: bold; }
-.programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
-.programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
-.programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
-.programlisting .normal     { color: #000000; }
-.programlisting .number     { color: #75507b; } /* tango: plum 2 */
-.programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
-.programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
-.programlisting .type       { color: #000000; }
-.programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
-.programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
+.listing_code .programlisting .cbracket   { color: #a40000; } /* tango: scarlet red 3 */
+.listing_code .programlisting .comment    { color: #a1a39d; } /* tango: aluminium 4 */
+.listing_code .programlisting .function   { color: #000000; font-weight: bold; }
+.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */
+.listing_code .programlisting .keyword    { color: #4e9a06; } /* tango: chameleon 3  */
+.listing_code .programlisting .linenum    { color: #babdb6; } /* tango: aluminium 3 */
+.listing_code .programlisting .normal     { color: #000000; }
+.listing_code .programlisting .number     { color: #75507b; } /* tango: plum 2 */
+.listing_code .programlisting .preproc    { color: #204a87; } /* tango: sky blue 3  */
+.listing_code .programlisting .string     { color: #c17d11; } /* tango: chocolate 2 */
+.listing_code .programlisting .type       { color: #000000; }
+.listing_code .programlisting .type a     { color: #11326b; } /* tango: sky blue 4 */
+.listing_code .programlisting .symbol     { color: #ce5c00; } /* tango: orange 3 */
 
 .listing_frame {
   /* tango:sky blue 1 */
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/thumbnail.html gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/thumbnail.html
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/html/thumbnail.html	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/html/thumbnail.html	2010-06-22 03:43:07.000000000 +0200
@@ -10,11 +10,6 @@
 <link rel="next" href="GnomeDesktopThumbnailFactory.html" title="GnomeDesktopThumbnailFactory">
 <meta name="generator" content="GTK-Doc V1.14 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
-<link rel="part" href="intro.html" title="Part I. GNOME Desktop Library Overview">
-<link rel="part" href="background.html" title="Part II. Desktop Background">
-<link rel="part" href="randr.html" title="Part III. Monitor Configuration">
-<link rel="part" href="thumbnail.html" title="Part IV. Thumbnails">
-<link rel="part" href="libgnome.html" title="Part V. Miscellaneous">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
 <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/Makefile.in gnome-desktop-2.30.2/docs/reference/gnome-desktop/Makefile.in
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -159,6 +159,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-bg.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-bg.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-bg.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-bg.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GnomeBG ##### -->
 <para>
 
@@ -70,6 +73,7 @@
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-item.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### ENUM GnomeDesktopItemType ##### -->
 <para>
 
@@ -323,6 +326,7 @@
 
 </para>
 
+@void: 
 @Returns: 
 
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail-factory.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail-factory.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail-factory.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail-factory.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GnomeDesktopThumbnailFactory ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-thumbnail.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gnome_desktop_thumbnail_has_uri ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-utils.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-utils.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-desktop-utils.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-desktop-utils.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### FUNCTION gnome_desktop_prepend_terminal_to_vector ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-config.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-config.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-config.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-config.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GnomeOutputInfo ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-crtc.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-crtc.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-crtc.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-crtc.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GnomeRRCrtc ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-labeler.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-labeler.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-labeler.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-labeler.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### STRUCT GnomeRRLabeler ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-mode.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-mode.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-mode.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-mode.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GnomeRRMode ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-output.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-output.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-output.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-output.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GnomeRROutput ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-screen.sgml gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-screen.sgml
--- gnome-desktop-2.30.0/docs/reference/gnome-desktop/tmpl/gnome-rr-screen.sgml	2010-03-30 23:15:28.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/gnome-desktop/tmpl/gnome-rr-screen.sgml	2010-06-22 03:43:07.000000000 +0200
@@ -17,6 +17,9 @@
 <!-- ##### SECTION Stability_Level ##### -->
 
 
+<!-- ##### SECTION Image ##### -->
+
+
 <!-- ##### TYPEDEF GnomeRRScreen ##### -->
 <para>
 
diff -Nru gnome-desktop-2.30.0/docs/reference/Makefile.in gnome-desktop-2.30.2/docs/reference/Makefile.in
--- gnome-desktop-2.30.0/docs/reference/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/docs/reference/Makefile.in	2010-06-22 03:42:24.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -192,6 +192,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -332,7 +333,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -357,7 +358,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff -Nru gnome-desktop-2.30.0/gnome-about/foundation-members.list gnome-desktop-2.30.2/gnome-about/foundation-members.list
--- gnome-desktop-2.30.0/gnome-about/foundation-members.list	2010-03-30 23:14:39.000000000 +0200
+++ gnome-desktop-2.30.2/gnome-about/foundation-members.list	2010-06-22 03:42:10.000000000 +0200
@@ -13,6 +13,7 @@
 Sebastien Bacher
 Scott Balneaves
 Marco Barisione
+Randal Barlow
 Matthew Barnes
 Emmanuele Bassi
 Pierre-Luc Beaudoin
@@ -29,8 +30,10 @@
 Wouter Bolsterlee
 Hylke Bons
 Paolo Borelli
+Milan Bouchet-Valat
 Karsten Bräckelmann
 Rob Bradford
+Joe Brockmeier
 Luca Bruno
 Simon Budig
 Ronald S. Bultje
@@ -47,21 +50,23 @@
 Milo Casagrande
 Ignacio Casal Quinteiro
 José María Casanova Crespo
+Cosimo Cecchi
 Young-Ho Cha
 Gaël Chamoulaud
 Damon Chaplin
-Nikos Charonitakis
 Emily Chen
 Ginn Chen
+Erwann Chénedé
 Michael J Chudobiak
 Barış Çiçek
 Serdar Cicek
+Bryan Clark
 Matthias Clasen
 Gil Forcada Codinachs
 Paul Cooper
 Andrew Cowie
 Olivier Crête
-Frédéric Crozat
+Frederic Crozat
 Murray Cumming
 Luis Miguel Cunha Medinas
 Paul Cutler
@@ -88,10 +93,9 @@
 Daniel Elstner
 Diego Escalante Urrelo
 Behdad Esfahbod
-Behnam Esfahbod
 Jim Evins
 Nils Faerber
-Elliot Fairweather
+Djavan Fagundes
 Christophe Fergeau
 Licio Fernando N. da Fonseca
 Luca Ferretti
@@ -101,7 +105,6 @@
 Leonardo Fontenelle
 Jean-François Fortin Tam
 Glynn Foster
-Ivan Frade
 Alexandre Franke
 Steve Frécinaux
 Brian G. Merrell
@@ -112,7 +115,6 @@
 Jim Garrison
 Sigurd Gartmann
 Siegfried-Angel Gevatter Pujals
-Lorenzo Gil Sánchez
 Evandro Fernandes Giovanini
 Parag Goel
 Jody Goldberg
@@ -124,7 +126,6 @@
 Jaap Haitsma
 Les Harris
 Mathias Hasselmann
-Heikki Henriksen
 James Henstridge
 Fernando Herrera
 Edward Hervey
@@ -136,17 +137,22 @@
 Richard Hughes
 Richard Hult
 Halton Huo
+Peter Hutterer
+Jukka-Pekka Iivonen
+Hiroyuki Ikezoe
 Juan Carlos Inostroza Oliva
 Eitan Isaacson
 Khandakar Mujahidul Islam
 Johnny Jacob
 Carl James Collier
 Scott James Remnant
-Robert James Taylor
 Tim Janik
 Adam Janos Reviczky
 Javier Jardón Cabezas
+William Jon McCann
 Jonathon Jongsma
+Flamarion Jorge
+William Kahn-Greene
 Theppitak Karoonboonyanan
 Felix Kaser
 Matt Keenan
@@ -163,6 +169,7 @@
 Petr Kovář
 Bradley M. Kuhn
 Kaushal Kumar
+Naba Kumar
 Akhil Laddha
 Priit Laes
 Pockey Lam
@@ -172,6 +179,7 @@
 Will LaShell
 Alex Launi
 Gregory Leblanc
+Garrett Michael LeSage
 Yan Li
 James Liggett
 Björn Lindqvist
@@ -207,7 +215,6 @@
 Michael Meeks
 Tino Meinen
 Federico Mena Quintero
-Tiago Menezes
 Lasse Bang Mikkelsen
 Gintautas Miliauskas
 Baptiste Mille-Mathias
@@ -221,6 +228,7 @@
 Tobias Mueller
 Frederic Muller
 Tim-Philipp Müller
+Florian Müllner
 Michael Natterer
 Jovan Naumovski
 Dave Neary
@@ -233,6 +241,7 @@
 Ismael Olea
 Sasa Ostrouska
 Benjamin Otte
+Sankarasivasubramanian P
 John (J5) Palmieri
 Gonzalo Paniagua Javier
 Kostas Papadimas
@@ -252,6 +261,8 @@
 Lennart Poettering
 Sebastian Pölsterl
 German Poo Caamaño
+Thorsten Prante
+Michael Pruett
 Michal Pryc
 Liam Quin
 Srinivasa Ragavan
@@ -259,14 +270,16 @@
 Stéphane Raimbault
 Goran Rakic
 Sriram Ramkrishna
+Mart Raudsepp
 Scott Reeves
-Travis Reitter
 Fábio Ricardo Nogueira dos Santos
 Hendrik Richter
 Felix Riemann
 Kristian Rietveld
 Ariel Rios
+Lucas Rocha
 Carlos Eduardo Rodrigues Diógenes
+Francisco Rojas
 Christian Rose
 JP Rosevear
 Alberto C Ruiz Ruiz
@@ -291,22 +304,20 @@
 Adam Schreiber
 Jeff Schroeder
 Vinicius Scopel Depizzol
-Don Scorgie
 Danilo Segan
 Dodji Seketeli
 Zhang Sen
 Martin Sevior
 Joe Shaw
 Nickolay V. Shmyrev
-Vladimer Sichinava
 David Siegel
+Alexandro Silva
 Gustavo Noronha Silva
 Sjoerd Simons
 Mukund Sivaraman
-Raphaël Slinckx
 Frank Solensky
 Richard Stallman
-Robert Staudinger
+Jeffrey Stedfast
 Jakub Steiner
 Thomas Vander Stichele
 Andrew Stormont
@@ -317,6 +328,7 @@
 Gian Mario Tagliaretti
 Jerry Tan
 Brad Taylor
+Owen Taylor
 Wim Taymans
 Marcel Telka
 Ghee Teo
@@ -361,9 +373,9 @@
 Aron Xu
 Li Yuan
 Rosanna Yuen
+Bryen Yunashko
 Patryk Zawadzki
 David Zeuthen
 Ava Zhang
 Marina Zhurakhinskaya
 Anne Østergaard
-Magnus Østergaard
diff -Nru gnome-desktop-2.30.0/gnome-about/headers/Makefile.in gnome-desktop-2.30.2/gnome-about/headers/Makefile.in
--- gnome-desktop-2.30.0/gnome-about/headers/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/gnome-about/headers/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -176,6 +176,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/gnome-about/Makefile.in gnome-desktop-2.30.2/gnome-about/Makefile.in
--- gnome-desktop-2.30.0/gnome-about/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/gnome-about/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -220,6 +220,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -447,7 +448,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -472,7 +473,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff -Nru gnome-desktop-2.30.0/gnome-version.xml gnome-desktop-2.30.2/gnome-version.xml
--- gnome-desktop-2.30.0/gnome-version.xml	2010-03-30 23:15:19.000000000 +0200
+++ gnome-desktop-2.30.2/gnome-version.xml	2010-06-22 03:42:56.000000000 +0200
@@ -2,9 +2,9 @@
 <gnome-version>
   <platform>2</platform>
   <minor>30</minor>
-  <micro>0</micro>
+  <micro>2</micro>
   <distributor>GNOME.Org</distributor>
-  <date>2010-03-30</date>
+  <date>2010-06-22</date>
   <description>
     
     <p>GNOME is a Free, usable, stable, accessible desktop environment for the Unix-like family of operating systems.</p>
@@ -120,7 +120,7 @@
     <p xml:lang="br">Kavet 'vez 'barzh GNOME pep tra a-benn implijout ho urzhiataer, an evezhier restroù, ar merdeer kenrouedad, lañserioù, ha lod a meziantoù a bep seurt.</p>
     <p xml:lang="bs">GNOME sadrži većinu onoga što vidite na vašem računaru, uključujući i menadžer datoteka, preglednik weba, menije i mnoge programe.</p>
     <p xml:lang="ca">El GNOME inclou gairebé tot el que veieu al vostre ordinador: el gestor de fitxers, el navegador web, els menús i moltes altres aplicacions.</p>
-    <p xml:lang="ca@valencia">El GNOME inclou gairebé tot el que veieu al vostre ordinador: el gestor de fitxers, navegador de web, menús i moltes altres aplicacions.</p>
+    <p xml:lang="ca@valencia">El GNOME inclou gairebé tot el que veieu al vostre ordinador: el gestor de fitxers, el navegador web, els menús i moltes altres aplicacions.</p>
     <p xml:lang="crh">GNOME, dosye idarecisi, ağ kezicisi, menüler ve çoq uyğulama dahil, bilgisayarıñızda körgenleriñizniñ ekseriyetini kirsete.</p>
     <p xml:lang="cs">GNOME zahrnuje většinu z toho, co ve svém počítači vidíte, včetně správce souborů, webového prohlížeče, nabídek a mnoha aplikací.</p>
     <p xml:lang="cy">Mae GNOME yn cynnwys y rhan fwyaf o beth rydych chi'n ei weld ar eich cyfrifiadur, yn cynnwys y rhelolydd ffeiliau, dewislenni, a llawer o rhaglenni.</p>
@@ -219,7 +219,7 @@
     <p xml:lang="br">GNOME a ginnig ur steudad klok a ostilhoù evit ar saverien meziantoù. Tu 'zo da grouiñ meziantoù luzius ha galloudus.</p>
     <p xml:lang="bs">GNOME sadrži i razvojnu platformu koja omogućava programerima da prave nove složene i moćne programe.</p>
     <p xml:lang="ca">El GNOME també inclou una plataforma de desenvolupament completa per a programadors d'aplicacions, que permet crear-ne de tot tipus.</p>
-    <p xml:lang="ca@valencia">El GNOME també inclou una completa plataforma de desenvolupament per a programadors d'aplicacions, que permet crear-ne de tot tipus.</p>
+    <p xml:lang="ca@valencia">El GNOME també inclou una plataforma de desenvolupament completa per a programadors d'aplicacions, que permet crear-ne de tot tipus.</p>
     <p xml:lang="crh">GNOME bir de uyğulama programcıları içün qudretli ve pıtraqlı uyğulamalarnı icat etebilecekleri tam bir inkişaf platformasını dahil ete.</p>
     <p xml:lang="cs">GNOME také poskytuje úplnou vývojovou platformu pro programátory aplikací, umožňující tvorbu mocných a komplexních aplikací.</p>
     <p xml:lang="cy">Mae GNOME hefyd yn cynnwys llwyfan datblygaeth cyflawn ar gyfer rhaglennwyr rhaglennu, sy'n caniatau creu rhaglenni pwerus a chymleth.</p>
@@ -259,7 +259,7 @@
     <p xml:lang="ky">Ошондой эле GNOME чөйрөсү кубаттуу жана татаал иштемелерди түзүүгө жол берүүчү даяр платформаны камтыйт.</p>
     <p xml:lang="lo">ນອກຈາກນີ້ ກາໂນມ ຍັງມີລະບົບຮອງຮັບ ທີ່ຊ່ວຍໃຫ້ຂຽນໂປຣເເກຣມ ສາມາດພັດທະນາໂປຣເເກຣມທີມີພະລັງສູງ ເເລະ ມີຄວາມອາດສາມາດ.</p>
     <p xml:lang="lt">GNOME aplinkoje taip pat yra išsami programavimo platforma programų kūrėjams, leidžianti kurti galingas ir sudėtingas programas.</p>
-    <p xml:lang="lv">GNOME sevī iekļauj arī pilnvērtīgu programmatūras izstrādes platformu, kas ļauj veidot dažādas daudzfunkcionālas un sarežģītas programmas.</p>
+    <p xml:lang="lv">GNOME sastāvā ir arī pilnvērtīga programmatūras izstrādes platforma, kas ļauj veidot daudzfunkcionālas un jaudīgas programmas.</p>
     <p xml:lang="mai">अनुप्रयोग प्रोग्रामरसभक लेल एकटा संपूर्ण विकास मंच (डेवलपमेंट प्लेटफार्म) गनोममे सम्मिलितअछि, जे क्षमतायुक्त जटिल अनुप्रयोगक सृष्टिमे सक्षम अछि.</p>
     <p xml:lang="mg">GNOME dia manana sehatra famolavolana feno ho an'ireo mpamolavola rindran'asa, entina hamoronana rindran'asa matanjaka ary maro sosona.</p>
     <p xml:lang="mk">GNOME вклучува комплетна платформа за развивање на апликации со што се дозволува брзо создавање на моќни и комплексни апликации.</p>
@@ -358,7 +358,7 @@
     <p xml:lang="ky">GNOME чөйрөсү колдонуудагы ыңгайлуулукка өзгөчө көңүл бурат (анын ичинде мүкүнчүлүгү чектелген адамдар үчүн да) жана анын жаңы версияларынын регулярдуу чыгуусу, күчтүү корпоративдик колдоосу башка эркин иш стол чөйрөлөрүнөн айырмалап турат.</p>
     <p xml:lang="lo">ກາໂນມ ເນັ້ນຄວາມງ່າຍໃນການໃຊ້ ພັດທະນາລູ້ນໃຫ່ມສະມໍ່າສະເມີ ເເລະ ໃດ້ຮັບການອຸບປະຖໍາຈາກກອງທຸລະກິດຢ່າງຕໍ່ເນື່ອງ ທັ້ງຫມົດທີ່ນໍາໃຫ້  ກາໂນມ ເປັນລະບົບເເດດຊ໌ທອບ໌ທີ່ບໍ່ຄືໃຜໃນກຸ່ມເເດດຊ໌ທອບ໌ທີ່ເປັນສອບເເວຣ໌ເເຟຣ໌</p>
     <p xml:lang="lt">GNOME paprastumas naudoti, prieinamumas visiems naudotojams, reguliarus naujų leidimų ciklas bei stiprus korporatyvinis užnugario palaikymas išskiria GNOME iš kitų Laisvos Programinės Įrangos grafinių aplinkų.</p>
-    <p xml:lang="lv">GNOMEs fokusēšanās uz lietojamību un pieejamību, regulārs jaunu versiju prezentēšanas cikls un spēcīgi korporatīvie sakari padara to unikālu starp Brīvās Programmatūras darbvidēm.</p>
+    <p xml:lang="lv">GNOME raksturīgās iezīmes ir uzsvars uz lietojamību un pieejamību, regulārs laidienu cikls un spēcīgs korporatīvais atbalsts.</p>
     <p xml:lang="mai">मुफ्त सोफ्टवेयर डेस्कटाप क' बीच गनोमक ई विशेषतासभ एकरा बेजोड़ बनबैत अछि - उपयोगिता आओर पहुँच पर संकेंद्रीकरण, नियमित रिलीज चक्र आओर सशक्त निगम क' समर्थन.</p>
     <p xml:lang="mg">Ny fimasoan'ny GNOME amin'ny fahafahana mampiasa tsara sy ny fanamorana ny fampiasana ny rindran'asa, ny fisesen'ny famoahana kinova, ary ny fanohanana mafonja avy amin'ny orinasa vaventy no tena mampiavaka azy amin'ireo rindran'asa desktop maimaimpoana misy.</p>
     <p xml:lang="mk">GNOME се фокусира на користност и пристапност. Регуларниот циклус на објавување на нови верзии го прави GNOME уникатен помеѓу слободните работни околини.</p>
@@ -415,8 +415,8 @@
     <p xml:lang="bn_IN">শক্তিশালী সম্প্রদায়ের উপস্থিতি GNOME-র সবচেয়ে মূল্যবান বৈশিষ্ট্য। কোড করার ক্ষমতা নির্বিশেষে যে কোনো ব্যক্তি GNOME ডেস্কটপ উন্নত করতে সাহায্যে করতে পারবেন।</p>
     <p xml:lang="br">Nerzh pouezusañ GNOME eo hon bedig-bed kreñv. Forzh pehini gant gouiziegezh war ar programmiñ pe get a c'hell kas traoù a-benn gwellaat GNOME.</p>
     <p xml:lang="bs">Najveća snaga GNOME-a je naša čvrsta zajednica. Gotovo svako, sa ili bez programerskih sposobnosti, može doprinijeti da GNOME bude još bolji.</p>
-    <p xml:lang="ca">El punt més fort del GNOME és la seva gran comunitat. Gairebé tothom, amb o sense coneixements de programació, pot contribuir a millorar el GNOME.</p>
-    <p xml:lang="ca@valencia">El punt més fort del GNOME és la seua gran comunitat. Gairebé tothom, amb o sense coneixements de programació, pot contribuir a millorar el GNOME.</p>
+    <p xml:lang="ca">El punt més fort del GNOME és la seva gran comunitat. Gairebé tothom, amb coneixements o sense de programació, pot contribuir a millorar el GNOME.</p>
+    <p xml:lang="ca@valencia">El punt més fort del GNOME és la seua gran comunitat. Gairebé tothom, amb coneixements o sense de programació, pot contribuir a millorar el GNOME.</p>
     <p xml:lang="crh">GNOME'nıñ eñ büyük küçü bizim küçlü toplulığımızdır. Erkes deyerlik, kodlama melekeleri olsa da olmasa da, GNOME'nı daa yahşı yapmaq içün isse qoşabilir.</p>
     <p xml:lang="cs">Největší silou GNOME je jeho silná komunita. Téměř kdokoliv, ať už s nebo bez znalosti programování, se může podílet na vylepšování GNOME.</p>
     <p xml:lang="cy">Cryfder mwyaf GNOME yw ein cymuned gref. Gall bron unrhywun, gyda neu heb sgiliau rhaglennu, gyfrannu at wella GNOME.</p>
@@ -456,7 +456,7 @@
     <p xml:lang="ky">GNOME чөйрөсүнүн артыкчылык жагы анын күчтүү колдонуучулар коомчулугунда. Ар бир адам программалоодо тажрыйбасы бар болсо да, тажрыйбасы жок болсо да, чөйрөнү жакшыртууга өз салымын кошо алат.</p>
     <p xml:lang="lo">ຈຸດທີ່ດີເດັນທີ່ສູດຂອງ ກາໂນມ ກໍ່ຄືຊູມຊົນທີ່ເຂົ້ມເເຂງ ທຸກ ຯ ຄົນ ບໍ່ວ່າຈະເປັນໃຜ ຫນັກຂຽນໂປຣເເກຣມຫລືບໍ່ ກໍ່ສານາດຮວມກັນພັດທະນາ ກາໂນມ ໃຫ້ດີຂື້ນໃດ້</p>
     <p xml:lang="lt">Didžiausia GNOME stiprybė yra labai stipri bendruomenė. Faktiškai kiekvienas, turintis ar neturintis programavimo įgudžių, gali prisidėti prie GNOME tobulinimo.</p>
-    <p xml:lang="lv">GNOME lielākais spēks slēpjas kopienā. Praktiski, jebkurš, ar vai bez programmēšanas iemaņām, var līdzdarboties, lai padarītu GNOME labāku.</p>
+    <p xml:lang="lv">GNOME lielākais spēks slēpjas kopienā. Praktiski jebkurš, ar vai bez programmēšanas iemaņām, var līdzdarboties, lai padarītu GNOME labāku.</p>
     <p xml:lang="mai">गनोमक विशाल शक्ति अछि हमर मजगूत समुदाय. बास्तवमे कोनो, कोडिंग कौशल हुए अथवा नहि हुए, गनोमकेँ बेहतर बनाबैमे अहाँ अपन जोगदान दए सकैत अछि.</p>
     <p xml:lang="mg">Ny tena herin'ny GNOME dia ny tanjaky ny fivondronan'ireo mpankafy azy. Azo lazaina hoe ny rehetrarehetra mihitsy no afaka mandray anjara amin'ny fanatsarana ny GNOME, na mahafehy ny fanafangoana izy na tsia.</p>
     <p xml:lang="mk">Најголемата сила на GNOME е во јаката заедница. Скоро секој со или без програмерски способности може да придонесе во подобрувањето на GNOME.</p>
@@ -514,8 +514,8 @@
     <p xml:lang="bn_IN">১৯৯৭ সালে GNOME আরম্ভ হওয়ার পরে শতশত মানুষ এই ডেস্কটপ নির্মাণের কাজে নিজেদের লেখা কোড  অন্তর্ভুক্ত করেছেন; অন্যান্য অনেকে বিভিন্ন কর্ম যেমন অনুবাদ, নথিপত্র লিখুন ও গুণমান পরীক্ষণে গুরুপূর্ণ যোগদান করেছেন।</p>
     <p xml:lang="br">Kantadoù a dud o deus kresket danvez diazez  GNOME abaoe ma oa krouet e 1997; kalz muioc'h ez eus bet o kenlabourat war dachennoù pouezhus all, troidigezhioù, teuliadur, surentezh ha savadur en o zouez.</p>
     <p xml:lang="bs">Stotine ljudi su napisali ponešto koda za GNOME od samog početka 1997. godine; mnogi su doprinijeli i na druge značajne načine, kao što su prijevodi, dokumentacija i kontrola kvaliteta.</p>
-    <p xml:lang="ca">Centenars de persones han contribuït codi al GNOME des de que es va començar al 1997; molts més hi han contribuït d'altres maneres importants, que inclouen traduccions, documentació i control de qualitat.</p>
-    <p xml:lang="ca@valencia">Centenars de persones han contribuït codi al GNOME des de que es va començar el 1997; molts més hi han contribuït d'altres maneres importants, que inclouen traduccions, documentació i control de qualitat.</p>
+    <p xml:lang="ca">Centenars de persones han contribuït codi al GNOME des que es va començar al 1997; molts més hi han contribuït d'altres maneres importants, que inclouen traduccions, documentació i control de qualitat.</p>
+    <p xml:lang="ca@valencia">Centenars de persones han contribuït codi al GNOME des que es va començar al 1997; molts més hi han contribuït d'altres maneres importants, que inclouen traduccions, documentació i control de qualitat.</p>
     <p xml:lang="crh">1997'de başlatılğanından berli yüzlerce insan GNOME'ğa kod issesi qoştı; çoq daası, tercimeler, vesiqalandırma ve keyfiyet kontroli dahil olmaq üzre, başqa müim yollar ile isse qoştılar.</p>
     <p xml:lang="cs">Od počátků GNOME v roce 1997 k němu přispěly kódem stovky lidí; mnoho dalších přispělo jinými důležitými způsoby, včetně překladů, dokumentace a kontroly kvality.</p>
     <p xml:lang="cy">Mae cannoedd o bobl wedi cyfrannu côd i GNOME ers iddo gychwyn yn 1997; mae llawer eraill wedi cyfrannu mewn ffyrdd pwysig eraill, yn cynnwys cyfieithiadau, dogfenniaeth, a sicrhau ansawdd.</p>
@@ -555,7 +555,7 @@
     <p xml:lang="ky">GNOME проекти 1997-жылы башталгандан тартып анын башат кодун жүздөгөн адамдар жазды, бирок андан да көп адамдар башка маанилүү жолдор менен б.а. которуу, документациялоо жана сапатын текшерүү аркылуу өз салымдарын кошушту.</p>
     <p xml:lang="lo">ຜູ່ຄົນຫລາຍຮ້ອຍໄດ້ຮ່ວມກັນພັດທະນາ ໂປຣເເກຣມ ສໍາລັບ ກາໂນມ ຕັ້ງເເຕ່ເລີ້ມໂຄງການຕອນປີ 2540 ຫລື 1998 ເເລະຍັງມີອີດຫລາຍ ຯ ທີ່ຊ່ວຍສົ່ງເສີມໃນທາງອື່ນ ຯ ເປັນຕົ້ນ ການເເປ ຂຽນຄູ່ມື ເເລະ ກວດສອບຄຸນນະພາບ</p>
     <p xml:lang="lt">Nuo GNOME projekto pradžios, 1997 metais, prie GNOME savo parašytu kodu prisidėjo šimtai žmonių; daug daugiau žmonių prisidėjo prie jo kitais labai svarbiais būdais: vertimu, dokumentacijos rašymu ir kokybės tikrinimu.</p>
-    <p xml:lang="lv">Simtiem cilvēku ir dalījušies ar savu izstrādes kodu, jau no pašiem GNOME sākumiem kopš 1997. gada; vēl vairāk cilvēku ir palīdzējuši citos nozīmīgos veidos, kā tulkošana, dokumentācijas rakstīšana, un kvalitātes pārbaude.</p>
+    <p xml:lang="lv">Simtiem programmētāju ir ieguldījuši savu darbu GNOME projektā kopš tā uzsākšanas 1997. gadā; vēl vairāk cilvēku ir palīdzējuši citos nozīmīgos veidos - tulkojot, rakstot dokumentāciju un nodrošinot kvalitātes pārbaudi.</p>
     <p xml:lang="mai">सन् 1997 सँ, जखन सँ ई शुरू भेल अछि सैकड़ासभ लोकनिसभ कोड क' योगदान गनोमकेँ केने अछि बहुते लोकनिसभ आन महत्वपूर्ण रूपेँ योगदान देने अछि जकरामे भाषानुवाद, दस्ताबेजीकरण आओरगुणवत्ता भरोसा सामिल अछि.</p>
     <p xml:lang="mg"> Olona aman-jatony no efa nanome fango an'ny GNOME hatramin'ny namoronana azy tamin'ny 1997. Maro toraka izany koa ireo olona nitondra fanampiana isan-karazany, toy ny fandikan-teny, ny loharanon-kevitra, ary ny fiantohana kalitao.</p>
     <p xml:lang="mk">Во создавањето на GNOME имаат удел стотици луѓе. Уште од кога е започнат проектот во 1997, многу луѓе имаат помогнато на разни начини вклучувајќи и преведување, изработување на документација и проверка на квалитетот.</p>
diff -Nru gnome-desktop-2.30.0/libgnome-desktop/libgnome/Makefile.in gnome-desktop-2.30.2/libgnome-desktop/libgnome/Makefile.in
--- gnome-desktop-2.30.0/libgnome-desktop/libgnome/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/libgnome-desktop/libgnome/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -179,6 +179,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/libgnome-desktop/libgnomeui/Makefile.in gnome-desktop-2.30.2/libgnome-desktop/libgnomeui/Makefile.in
--- gnome-desktop-2.30.0/libgnome-desktop/libgnomeui/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/libgnome-desktop/libgnomeui/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -179,6 +179,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/libgnome-desktop/Makefile.in gnome-desktop-2.30.2/libgnome-desktop/Makefile.in
--- gnome-desktop-2.30.0/libgnome-desktop/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/libgnome-desktop/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -265,6 +265,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -592,7 +593,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -617,7 +618,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
diff -Nru gnome-desktop-2.30.0/m4/intltool.m4 gnome-desktop-2.30.2/m4/intltool.m4
--- gnome-desktop-2.30.0/m4/intltool.m4	2010-03-30 23:14:44.000000000 +0200
+++ gnome-desktop-2.30.2/m4/intltool.m4	2010-06-22 03:42:15.000000000 +0200
@@ -172,7 +172,7 @@
 AC_DEFUN([IT_PO_SUBDIR],
 [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
 dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
+dnl The following CONFIG_COMMANDS should be executed at the very end
 dnl of config.status.
 AC_CONFIG_COMMANDS_PRE([
   AC_CONFIG_COMMANDS([$1/stamp-it], [
diff -Nru gnome-desktop-2.30.0/Makefile.in gnome-desktop-2.30.2/Makefile.in
--- gnome-desktop-2.30.0/Makefile.in	2010-03-30 23:14:56.000000000 +0200
+++ gnome-desktop-2.30.2/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -232,6 +232,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -459,7 +460,7 @@
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -484,7 +485,7 @@
 	fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-	@failcom='exit 1'; \
+	@fail= failcom='exit 1'; \
 	for f in x $$MAKEFLAGS; do \
 	  case $$f in \
 	    *=* | --[!k]*);; \
@@ -648,7 +649,8 @@
 	  fi; \
 	done
 	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
@@ -691,17 +693,17 @@
 distcheck: dist
 	case '$(DIST_ARCHIVES)' in \
 	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
-	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
diff -Nru gnome-desktop-2.30.0/man/Makefile.in gnome-desktop-2.30.2/man/Makefile.in
--- gnome-desktop-2.30.0/man/Makefile.in	2010-03-30 23:14:55.000000000 +0200
+++ gnome-desktop-2.30.2/man/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -177,6 +177,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/NEWS gnome-desktop-2.30.2/NEWS
--- gnome-desktop-2.30.0/NEWS	2010-03-30 23:14:32.000000000 +0200
+++ gnome-desktop-2.30.2/NEWS	2010-06-22 03:42:01.000000000 +0200
@@ -1,4 +1,20 @@
 ==============
+Version 2.30.2
+==============
+
+  Translators
+
+	* Gil Forcada (ca)
+	* Gil Forcada (ca@valencia)
+	* Ivar Smolin (et)
+	* Shankar Prasad (kn)
+	* Anita Reitere (lv)
+	* Sandeep Shedmake (mr)
+	* Ahmed Noor Kader Mustajir Md Eusoff (ms)
+	* Kjartan Maraas (nb)
+	* Manoj Kumar Giri (or)
+
+==============
 Version 2.30.0
 ==============
 
diff -Nru gnome-desktop-2.30.0/pixmaps/Makefile.in gnome-desktop-2.30.2/pixmaps/Makefile.in
--- gnome-desktop-2.30.0/pixmaps/Makefile.in	2010-03-30 23:14:56.000000000 +0200
+++ gnome-desktop-2.30.2/pixmaps/Makefile.in	2010-06-22 03:42:25.000000000 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -176,6 +176,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
diff -Nru gnome-desktop-2.30.0/po/ca.po gnome-desktop-2.30.2/po/ca.po
--- gnome-desktop-2.30.0/po/ca.po	2010-03-30 01:55:52.000000000 +0200
+++ gnome-desktop-2.30.2/po/ca.po	2010-04-09 10:48:05.000000000 +0200
@@ -10,7 +10,7 @@
 "Project-Id-Version: gnome-desktop 2.12.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-13 16:21+0100\n"
-"PO-Revision-Date: 2010-03-13 16:20+0100\n"
+"PO-Revision-Date: 2010-04-02 17:33+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
@@ -139,8 +139,8 @@
 "GNOME's greatest strength is our strong community. Virtually anyone, with or "
 "without coding skills, can contribute to making GNOME better."
 msgstr ""
-"El punt més fort del GNOME és la seva gran comunitat. Gairebé tothom, amb o "
-"sense coneixements de programació, pot contribuir a millorar el GNOME."
+"El punt més fort del GNOME és la seva gran comunitat. Gairebé tothom, amb "
+"coneixements o sense de programació, pot contribuir a millorar el GNOME."
 
 #: ../gnome-version.xml.in.in.h:9
 msgid ""
@@ -148,7 +148,7 @@
 "1997; many more have contributed in other important ways, including "
 "translations, documentation, and quality assurance."
 msgstr ""
-"Centenars de persones han contribuït codi al GNOME des de que es va començar "
+"Centenars de persones han contribuït codi al GNOME des que es va començar "
 "al 1997; molts més hi han contribuït d'altres maneres importants, que "
 "inclouen traduccions, documentació i control de qualitat."
 
diff -Nru gnome-desktop-2.30.0/po/ca@valencia.po gnome-desktop-2.30.2/po/ca@valencia.po
--- gnome-desktop-2.30.0/po/ca@valencia.po	2009-04-22 17:29:54.000000000 +0200
+++ gnome-desktop-2.30.2/po/ca@valencia.po	2010-05-26 19:17:40.000000000 +0200
@@ -1,24 +1,24 @@
-# gnome-desktop translation to Valencian (southern Catalan).
+# gnome-desktop translation to Catalan.
 # Copyright © 2000, 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
 # Ivan Vilata i Balaguer <ivan@selidor.net>, 2000.
 # Softcatalà <info@softcatala.org>, 2000.
 # Jordi Mallach <jordi@sindominio.net>, 2002, 2003, 2004, 2005, 2007.
+# Gil Forcada <gilforcada@guifi.net>, 2008, 2009, 2010.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop 2.12.0\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
-"desktop&component=general\n"
-"POT-Creation-Date: 2009-04-08 18:17+0000\n"
-"PO-Revision-Date: 2009-01-29 14:17+0100\n"
-"Last-Translator: Jordi Mallach <jordi@sindominio.net>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-21 23:44+0200\n"
+"PO-Revision-Date: 2010-04-02 17:33+0200\n"
+"Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:1
-#: ../gnome-about/gnome-about.in:61
+#: ../gnome-about/gnome-about.in:60
 msgid "About GNOME"
 msgstr "Quant al GNOME"
 
@@ -26,75 +26,75 @@
 msgid "Learn more about GNOME"
 msgstr "Apreneu més coses sobre el GNOME"
 
-#: ../gnome-about/gnome-about.in:62
+#: ../gnome-about/gnome-about.in:61
 msgid "News"
 msgstr "Notícies"
 
-#: ../gnome-about/gnome-about.in:63
+#: ../gnome-about/gnome-about.in:62
 msgid "GNOME Library"
 msgstr "Biblioteca del GNOME"
 
-#: ../gnome-about/gnome-about.in:64
+#: ../gnome-about/gnome-about.in:63
 msgid "Friends of GNOME"
 msgstr "Amics del GNOME"
 
-#: ../gnome-about/gnome-about.in:65
+#: ../gnome-about/gnome-about.in:64
 msgid "Contact"
 msgstr "Contacte"
 
-#: ../gnome-about/gnome-about.in:69
+#: ../gnome-about/gnome-about.in:68
 msgid "The Mysterious GEGL"
 msgstr "El misteriós GEGL"
 
-#: ../gnome-about/gnome-about.in:70
+#: ../gnome-about/gnome-about.in:69
 msgid "The Squeaky Rubber GNOME"
 msgstr "El GNOME de goma estrident"
 
-#: ../gnome-about/gnome-about.in:71
+#: ../gnome-about/gnome-about.in:70
 msgid "Wanda The GNOME Fish"
 msgstr "Wanda el peix del GNOME"
 
-#: ../gnome-about/gnome-about.in:568
+#: ../gnome-about/gnome-about.in:567
 msgid "_Open URL"
 msgstr "_Obri l'URL"
 
-#: ../gnome-about/gnome-about.in:575
+#: ../gnome-about/gnome-about.in:574
 msgid "_Copy URL"
 msgstr "_Copia l'URL"
 
-#: ../gnome-about/gnome-about.in:830
+#: ../gnome-about/gnome-about.in:826
 msgid "About the GNOME Desktop"
 msgstr "Quant a l'escriptori GNOME"
 
-#: ../gnome-about/gnome-about.in:866
+#: ../gnome-about/gnome-about.in:859
 msgid "%(name)s: %(value)s"
 msgstr "%(name)s: %(value)s"
 
-#: ../gnome-about/gnome-about.in:880
+#: ../gnome-about/gnome-about.in:873
 msgid "Welcome to the GNOME Desktop"
 msgstr "Benvingut a l'escriptori GNOME"
 
-#: ../gnome-about/gnome-about.in:897
+#: ../gnome-about/gnome-about.in:890
 msgid "Brought to you by:"
 msgstr "Tot això ha estat possible gràcies a:"
 
-#: ../gnome-about/gnome-about.in:921
+#: ../gnome-about/gnome-about.in:914
 msgid "<b>%(name)s:</b> %(value)s"
 msgstr "<b>%(name)s:</b> %(value)s"
 
-#: ../gnome-about/gnome-about.in:982
+#: ../gnome-about/gnome-about.in:975
 msgid "Version"
 msgstr "Versió"
 
-#: ../gnome-about/gnome-about.in:984
+#: ../gnome-about/gnome-about.in:977
 msgid "Distributor"
 msgstr "Distribuïdor"
 
-#: ../gnome-about/gnome-about.in:986
+#: ../gnome-about/gnome-about.in:979
 msgid "Build Date"
 msgstr "Data de muntatge"
 
-#: ../gnome-about/gnome-about.in:1031
+#: ../gnome-about/gnome-about.in:1024
 msgid "Display information on this GNOME version"
 msgstr "Mostra informació d'esta versió del GNOME"
 
@@ -103,7 +103,7 @@
 "GNOME also includes a complete development platform for applications "
 "programmers, allowing the creation of powerful and complex applications."
 msgstr ""
-"El GNOME també inclou una completa plataforma de desenvolupament per a "
+"El GNOME també inclou una plataforma de desenvolupament completa per a "
 "programadors d'aplicacions, que permet crear-ne de tot tipus."
 
 #: ../gnome-version.xml.in.in.h:2
@@ -112,7 +112,7 @@
 "manager, web browser, menus, and many applications."
 msgstr ""
 "El GNOME inclou gairebé tot el que veieu al vostre ordinador: el gestor de "
-"fitxers, navegador de web, menús i moltes altres aplicacions."
+"fitxers, el navegador web, els menús i moltes altres aplicacions."
 
 #. NOTE TO AUTHORS: Do not put anything in the following paragraphs that
 #. will be substituted by the configure script. Otherwise you will break
@@ -139,8 +139,8 @@
 "GNOME's greatest strength is our strong community. Virtually anyone, with or "
 "without coding skills, can contribute to making GNOME better."
 msgstr ""
-"El punt més fort del GNOME és la seua gran comunitat. Gairebé tothom, amb o "
-"sense coneixements de programació, pot contribuir a millorar el GNOME."
+"El punt més fort del GNOME és la seua gran comunitat. Gairebé tothom, amb "
+"coneixements o sense de programació, pot contribuir a millorar el GNOME."
 
 #: ../gnome-version.xml.in.in.h:9
 msgid ""
@@ -148,15 +148,15 @@
 "1997; many more have contributed in other important ways, including "
 "translations, documentation, and quality assurance."
 msgstr ""
-"Centenars de persones han contribuït codi al GNOME des de que es va començar "
-"el 1997; molts més hi han contribuït d'altres maneres importants, que "
-"inclouen traduccions, documentació i control de qualitat."
-
-#: ../libgnome-desktop/display-name.c:213
-msgid "Laptop"
-msgstr "Portàtil"
-
-#: ../libgnome-desktop/display-name.c:221
+"Centenars de persones han contribuït codi al GNOME des que es va començar al "
+"1997; molts més hi han contribuït d'altres maneres importants, que inclouen "
+"traduccions, documentació i control de qualitat."
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -170,52 +170,57 @@
 msgid "Error rewinding file '%s': %s"
 msgstr "S'ha produït un error en rebobinar el fitxer «%s»: %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:377
-#: ../libgnome-desktop/gnome-desktop-item.c:3519
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
 msgid "No name"
 msgstr "Sense nom"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:604
+#: ../libgnome-desktop/gnome-desktop-item.c:607
 #, c-format
 msgid "File '%s' is not a regular file or directory."
 msgstr "El fitxer «%s» no és un fitxer o directori normal."
 
-#: ../libgnome-desktop/gnome-desktop-item.c:788
+#: ../libgnome-desktop/gnome-desktop-item.c:791
 #, c-format
-msgid "Error cannot find file id '%s'"
-msgstr "S'ha produït un error: no s'ha trobat l'id del fitxer «%s»"
+msgid "Cannot find file '%s'"
+msgstr "No s'ha pogut trobar el fitxer «%s»"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:834
+#: ../libgnome-desktop/gnome-desktop-item.c:837
 #, c-format
 msgid "No filename to save to"
 msgstr "No hi ha un nom de fitxer per a alçar"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:1819
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
 #, c-format
 msgid "Starting %s"
 msgstr "S'està iniciant %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2055
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
 #, c-format
 msgid "No URL to launch"
-msgstr "No hi ha una URL per a llançar"
+msgstr "No hi ha un URL per a obrir"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2071
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
 #, c-format
 msgid "Not a launchable item"
 msgstr "No és un element llançable"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2081
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
 #, c-format
 msgid "No command (Exec) to launch"
 msgstr "No hi ha una orde (Exec) per a llançar"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2094
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
 #, c-format
 msgid "Bad command (Exec) to launch"
 msgstr "Orde errònia (Exec) per a llançar"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:3575
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
 #, c-format
 msgid "Unknown encoding of: %s"
 msgstr "Codificació desconeguda de: %s"
@@ -226,30 +231,30 @@
 "No s'ha trobat cap terminal, s'utilitzarà l'xterm encara que potser no "
 "funcione"
 
-#: ../libgnome-desktop/gnome-rr.c:318
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
-msgid "unhandled X error while getting the range of screen sizes"
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr ""
-"en obtindre les grandàries de pantalla s'ha produït un error no gestionat de "
-"l'X"
+"no s'han pogut obtindre els recursos de la pantalla (CRTC, eixides, modes)"
 
-#: ../libgnome-desktop/gnome-rr.c:324
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
-msgid "could not get the range of screen sizes"
-msgstr "no s'ha pogut obtindre el rang de les grandàries de pantalla"
+msgid "unhandled X error while getting the range of screen sizes"
+msgstr ""
+"s'ha produït un error no gestionat de l'X en obtindre les mides de pantalla"
 
-#: ../libgnome-desktop/gnome-rr.c:427
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
-msgid "could not get the screen resources (CRTCs, outputs, modes)"
-msgstr ""
-"no s'han pogut obtindre els recursos de la pantalla (CRTC, eixides, modes)"
+msgid "could not get the range of screen sizes"
+msgstr "no s'ha pogut obtindre el rang de les mides de pantalla"
 
-#: ../libgnome-desktop/gnome-rr.c:583
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "no hi ha l'extensió RANDR"
 
-#: ../libgnome-desktop/gnome-rr.c:814
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
 msgstr "no s'ha pogut obtindre la informació sobre l'eixida %d"
@@ -257,26 +262,30 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:1112
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position=(%"
 "d, %d), size=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"la posició/grandària sol·licitades per al CRTC %d són fora dels límits "
-"permesos: posició=(%d, %d), grandària=(%d, %d), màxim=(%d, %d)"
+"la posició/mida sol·licitades per al CRTC %d són fora dels límits permesos: "
+"posició=(%d, %d), mida=(%d, %d), màxim=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1148
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "no s'ha pogut establir la configuració per al CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr.c:1260
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "no s'ha pogut obtindre la informació sobre el CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1128
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "Portàtil"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
@@ -287,20 +296,30 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1576
+#: ../libgnome-desktop/gnome-rr-config.c:1689
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"la grandària virtual sol·licitada no s'ajusta a la grandària disponible: "
-"sol·licitada=(%d, %d), mínima=(%d, %d), màxima=(%d, %d)"
+"la mida virtual sol·licitada no s'ajusta a la mida disponible: sol·licitada="
+"(%d, %d), mínima=(%d, %d), màxima=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1590
+#: ../libgnome-desktop/gnome-rr-config.c:1703
 #, c-format
 msgid "could not find a suitable configuration of screens"
 msgstr "no s'ha pogut trobar una configuració adequada de les pantalles"
 
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor.  Here, "Mirror" is being
+#. * used as an adjective, not as a verb.  For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
+msgid "Mirror Screens"
+msgstr "Pantalles duplicades"
+
 #~ msgid "Directory"
 #~ msgstr "Directori"
 
diff -Nru gnome-desktop-2.30.0/po/et.po gnome-desktop-2.30.2/po/et.po
--- gnome-desktop-2.30.0/po/et.po	2010-03-04 16:38:07.000000000 +0100
+++ gnome-desktop-2.30.2/po/et.po	2010-06-22 03:40:37.000000000 +0200
@@ -13,10 +13,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-desktop HEAD\n"
+"Project-Id-Version: gnome-desktop 2.30\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&component=general\n"
-"POT-Creation-Date: 2010-02-22 11:33+0000\n"
+"POT-Creation-Date: 2010-04-21 21:45+0000\n"
 "PO-Revision-Date: 2010-02-23 08:29+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -135,9 +135,6 @@
 "muul moel kaasa aidanud: näiteks tõlkimise, dokumentatsiooni kirjutamise "
 "ning kvaliteedikontrolliga."
 
-msgid "Laptop"
-msgstr "Sülearvuti"
-
 #. Translators: "Unknown" here is used to identify a monitor for which
 #. * we don't know the vendor. When a vendor is known, the name of the
 #. * vendor is used.
@@ -153,6 +150,11 @@
 msgid "Error rewinding file '%s': %s"
 msgstr "Viga faili '%s' tagasikerimisel: %s"
 
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
 msgid "No name"
 msgstr "Nimi puudub"
 
@@ -197,6 +199,7 @@
 "Terminali pole võimalik leida, kasutatakse xtermi, isegi juhul, kui see ei "
 "pruugi töötada"
 
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "ekraani ressursse (CRTC-d, väljundeid, režiime) pole võimalik hankida"
@@ -236,6 +239,9 @@
 msgid "could not get information about CRTC %d"
 msgstr "CRTC %d kohta pole võimalik teavet hankida"
 
+msgid "Laptop"
+msgstr "Sülearvuti"
+
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
diff -Nru gnome-desktop-2.30.0/po/kn.po gnome-desktop-2.30.2/po/kn.po
--- gnome-desktop-2.30.0/po/kn.po	2009-09-21 18:10:31.000000000 +0200
+++ gnome-desktop-2.30.2/po/kn.po	2010-06-22 03:40:37.000000000 +0200
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Shankar Prasad <svenkate@redhat.com>, 2007, 2008, 2009.
+# Shankar Prasad <svenkate@redhat.com>, 2007, 2008, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop.master.kn\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&component=general\n"
-"POT-Creation-Date: 2009-08-19 19:24+0000\n"
-"PO-Revision-Date: 2009-09-16 00:00+0530\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-21 13:11+0530\n"
+"PO-Revision-Date: 2010-04-03 16:09+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
-"Language-Team: Kannada <en@li.org>\n"
+"Language-Team: kn-IN <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:1
@@ -152,11 +152,12 @@
 "ಹಲವಾರು ಜನರು, ಅನುವಾದಗಳು, ದಸ್ತಾವೇಜು ಬರೆಯುವಿಕೆ, ಹಾಗು ಗುಣಮಟ್ಟದ ಭರವಸೆ ಕಾರ್ಯ ಹಾಗು "
 "ಇನ್ನೂ ಅನೇಕ ರೀತಿಯಲ್ಲಿ ನೆರವಾಗಿದ್ದಾರೆ."
 
-#: ../libgnome-desktop/display-name.c:262
-msgid "Laptop"
-msgstr "ಲ್ಯಾಪ್‌ಟಾಪ್"
-
-#: ../libgnome-desktop/display-name.c:270
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+#, fuzzy
+msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "ಗೊತ್ತಿರದ"
 
@@ -170,52 +171,57 @@
 msgid "Error rewinding file '%s': %s"
 msgstr "'%s' ಕಡತವನ್ನು ಪುನಃ ಸುತ್ತುವಲ್ಲಿ ದೋಷ: %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:377
-#: ../libgnome-desktop/gnome-desktop-item.c:3519
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
 msgid "No name"
 msgstr "ಹೆಸರಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:604
+#: ../libgnome-desktop/gnome-desktop-item.c:607
 #, c-format
 msgid "File '%s' is not a regular file or directory."
 msgstr "'%s' ಕಡತವು ಒಂದು ಸಾಮಾನ್ಯ ಕಡತ ಅಥವ ಕಡತಕೋಶವಾಗಿಲ್ಲ."
 
-#: ../libgnome-desktop/gnome-desktop-item.c:788
-#, c-format
-msgid "Error cannot find file id '%s'"
+#: ../libgnome-desktop/gnome-desktop-item.c:791
+#, fuzzy, c-format
+msgid "Cannot find file '%s'"
 msgstr "ಕಡತ ಐಡಿ '%s' ಅನ್ನು ಪತ್ತೆ ಮಾಡಲಾಗಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:834
+#: ../libgnome-desktop/gnome-desktop-item.c:837
 #, c-format
 msgid "No filename to save to"
 msgstr "ಉಳಿಸಲು ಯಾವುದೆ ಕಡತದ ಹೆಸರಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:1819
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
 #, c-format
 msgid "Starting %s"
 msgstr "ಶುರುವಾಗುತ್ತಿದೆ  %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2055
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
 #, c-format
 msgid "No URL to launch"
 msgstr "ಆರಂಭಿಸಲು ಯಾವುದೆ URL ಇಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2071
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
 #, c-format
 msgid "Not a launchable item"
 msgstr "ಆರಂಭಿಸಬಹುದಾದ ಒಂದು ಅಂಶವಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2081
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
 #, c-format
 msgid "No command (Exec) to launch"
 msgstr "ಆರಂಭಿಸಲು ಯಾವುದೆ ಆಜ್ಞೆ (ಕಾರ್ಯಗತ) ಇಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2094
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
 #, c-format
 msgid "Bad command (Exec) to launch"
 msgstr "ಆರಂಭಿಸಲು ಸರಿಯಲ್ಲದ ಆಜ್ಞೆ (ಕಾರ್ಯಗತ)"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:3575
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
 #, c-format
 msgid "Unknown encoding of: %s"
 msgstr "ಇದರ ಗೊತ್ತಿರದ ಎನ್ಕೋಡಿಂಗ್ : %s"
@@ -224,27 +230,28 @@
 msgid "Cannot find a terminal, using xterm, even if it may not work"
 msgstr "ಟರ್ಮಿನಲ್ ಕಂಡುಬಂದಿಲ್ಲ, xterm ಅನ್ನು ಬಳಸಲಾಗುತ್ತಿದೆ, ಅದೂ ಸಹ ಕೆಲಸ ಮಾಡದೆ ಇರಬಹುದು"
 
-#: ../libgnome-desktop/gnome-rr.c:405
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "ತೆರೆಯ ಸಂಪನ್ಮೂಲಗಳನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ (CRTCಗಳು, ಔಟ್‌ಪುಟ್‌ಗಳು, ಕ್ರಮಗಳು)"
 
-#: ../libgnome-desktop/gnome-rr.c:425
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "ತೆರೆಯ ಗಾತ್ರಗಳ ಶ್ರೇಣಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವಾಗ ನಿಭಾಯಿಸಲಾಗದ X ದೋಷ"
 
-#: ../libgnome-desktop/gnome-rr.c:431
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "ತೆರೆಯ ಗಾತ್ರಗಳ ಶ್ರೇಣಿಯನ್ನು ಪಡೆದುಕೊಳ್ಳಲಾಗಲಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-rr.c:657
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "RANDR ವಿಸ್ತರಣೆಯು ಅಸ್ತಿತ್ವದಲ್ಲಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-rr.c:923
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
 msgstr "ಔಟ್‌ಪುಟ್ %d ನ ಬಗೆಗೆ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
@@ -252,7 +259,7 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:1261
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position=(%"
@@ -261,25 +268,83 @@
 "CRTC %d ಗಾಗಿ ಮನವಿ ಸಲ್ಲಿಸಲಾದ ಸ್ಥಾನ/ಗಾತ್ರವು ಮಿತಿಯ ಹೊರಗಿದೆ: ಸ್ಥಾನ=(%d, %d), ಗಾತ್ರ=(%"
 "d, %d), ಗರಿಷ್ಟ=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1297
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "CRTC %d ಗಾಗಿ ಸಂರಚನೆಯನ್ನು ಸಿದ್ಧಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-rr.c:1409
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "CRTC %d ನ ಬಗೆಗೆ ಮಾಹಿತಿಯನ್ನು ಪಡೆಯಲಾಗಲಿಲ್ಲ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1159
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "ಲ್ಯಾಪ್‌ಟಾಪ್"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
-msgid "none of the saved display configurations matched the active configuration"
+msgid ""
+"none of the saved display configurations matched the active configuration"
 msgstr "ಉಳಿಸಲಾದ ಯಾವುದೆ ಸಂರಚನೆಗಳು ಸಕ್ರಿಯ ಸಂರಚನೆಗೆ ತಾಳೆಯಾಗುತ್ತಿಲ್ಲ"
 
+#: ../libgnome-desktop/gnome-rr-config.c:1423
+#, c-format
+msgid "CRTC %d cannot drive output %s"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1430
+#, c-format
+msgid "output %s does not support mode %dx%d@%dHz"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1441
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1455
+#, c-format
+msgid ""
+"output %s does not have the same parameters as another cloned output:\n"
+"existing mode = %d, new mode = %d\n"
+"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
+"existing rotation = %s, new rotation = %s"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1470
+#, c-format
+msgid "cannot clone to output %s"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1639
+#, c-format
+msgid "Trying modes for CRTC %d\n"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1663
+#, c-format
+msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1710
+#, c-format
+msgid ""
+"could not assign CRTCs to outputs:\n"
+"%s"
+msgstr ""
+
+#: ../libgnome-desktop/gnome-rr-config.c:1714
+#, c-format
+msgid ""
+"none of the selected modes were compatible with the possible modes:\n"
+"%s"
+msgstr ""
+
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1682
+#: ../libgnome-desktop/gnome-rr-config.c:1796
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -288,18 +353,18 @@
 "ಅಗತ್ಯವಿರುವ ವರ್ಚುವಲ್ ಗಾತ್ರವು ಲಭ್ಯವಿರುವ ಗಾತ್ರಕ್ಕೆ ಸರಿಹೊಂದುವುದಿಲ್ಲ: ಮನವಿ ಮಾಡಿದ್ದು=(%d, %"
 "d), ಕನಿಷ್ಟ=(%d, %d), ಗರಿಷ್ಟ=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1696
-#, c-format
-msgid "could not find a suitable configuration of screens"
-msgstr "ತೆರೆಗಳ ಸೂಕ್ತವಾದ ಸಂರಚನೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
-
 #. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
 #. Translators:  this is the feature where what you see on your laptop's
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../libgnome-desktop/gnome-rr-labeler.c:210
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
 msgid "Mirror Screens"
 msgstr "ಪ್ರತಿಬಿಂಬಿತ ತೆರೆಗಳು"
 
+#~ msgid "RANDR extension is too old (< 1.2)"
+#~ msgstr "RANDR ವಿಸ್ತರಣೆಯು ಬಹಳ ಹಳೆಯದಾಗಿದೆ (< 1.2)"
+
+#~ msgid "could not find a suitable configuration of screens"
+#~ msgstr "ತೆರೆಗಳ ಸೂಕ್ತವಾದ ಸಂರಚನೆಯನ್ನು ಪತ್ತೆ ಮಾಡಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
diff -Nru gnome-desktop-2.30.0/po/lv.po gnome-desktop-2.30.2/po/lv.po
--- gnome-desktop-2.30.0/po/lv.po	2009-04-19 19:39:06.000000000 +0200
+++ gnome-desktop-2.30.2/po/lv.po	2010-05-26 19:17:40.000000000 +0200
@@ -6,22 +6,25 @@
 # P�eris Krij�is <peterisk@apollo.lv>, 2000.
 # Artis Trops <hornet@navigators.lv>, 2000.
 # Raivis Dejus <orvils@gmail.com>, 2006, 2007, 2009.
+# Anita Reitere <nitalynx@gmail.com>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&amp;component=general\n"
-"POT-Creation-Date: 2008-12-09 18:19+0000\n"
-"PO-Revision-Date: 2009-01-25 13:43+0200\n"
-"Last-Translator: Raivis Dejus <orvils@gmail.com>\n"
-"Language-Team: Latvian <locale@laka.lv>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=gnome-desktop&component=general\n"
+"POT-Creation-Date: 2010-04-09 07:24+0000\n"
+"PO-Revision-Date: 2010-04-21 15:05+0300\n"
+"Last-Translator: Anita Reitere <nitalynx@gmail.com>\n"
+"Language-Team: Latviešu <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+"X-Generator: Lokalize 1.0\n"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:1
-#: ../gnome-about/gnome-about.in:61
+#: ../gnome-about/gnome-about.in:60
 msgid "About GNOME"
 msgstr "Par GNOME"
 
@@ -29,67 +32,67 @@
 msgid "Learn more about GNOME"
 msgstr "Uzziniet vairāk par GNOME"
 
-#: ../gnome-about/gnome-about.in:62
+#: ../gnome-about/gnome-about.in:61
 msgid "News"
 msgstr "Ziņas"
 
-#: ../gnome-about/gnome-about.in:63
+#: ../gnome-about/gnome-about.in:62
 msgid "GNOME Library"
 msgstr "GNOME bibliotēka"
 
-#: ../gnome-about/gnome-about.in:64
+#: ../gnome-about/gnome-about.in:63
 msgid "Friends of GNOME"
 msgstr "GNOME draugi"
 
-#: ../gnome-about/gnome-about.in:65
+#: ../gnome-about/gnome-about.in:64
 msgid "Contact"
 msgstr "Kontakti"
 
-#: ../gnome-about/gnome-about.in:69
+#: ../gnome-about/gnome-about.in:68
 msgid "The Mysterious GEGL"
-msgstr "Mistiskais GEGL"
+msgstr "Noslēpumainais GEGL"
 
-#: ../gnome-about/gnome-about.in:70
+#: ../gnome-about/gnome-about.in:69
 msgid "The Squeaky Rubber GNOME"
-msgstr "Pīkstošā gumijas GNOME"
+msgstr "GNOME gumijas rūķītis"
 
-#: ../gnome-about/gnome-about.in:71
+#: ../gnome-about/gnome-about.in:70
 msgid "Wanda The GNOME Fish"
 msgstr "GNOME zivtiņa Vanda"
 
-#: ../gnome-about/gnome-about.in:568
+#: ../gnome-about/gnome-about.in:567
 msgid "_Open URL"
 msgstr "_Atvērt URL"
 
-#: ../gnome-about/gnome-about.in:575
+#: ../gnome-about/gnome-about.in:574
 msgid "_Copy URL"
 msgstr "_Kopēt URL"
 
-#: ../gnome-about/gnome-about.in:830
+#: ../gnome-about/gnome-about.in:826
 msgid "About the GNOME Desktop"
 msgstr "Par GNOME darbvidi"
 
-#: ../gnome-about/gnome-about.in:866
+#: ../gnome-about/gnome-about.in:859
 msgid "%(name)s: %(value)s"
 msgstr "%(name)s: %(value)s"
 
-#: ../gnome-about/gnome-about.in:880
+#: ../gnome-about/gnome-about.in:873
 msgid "Welcome to the GNOME Desktop"
 msgstr "Laipni lūgti GNOME vidē"
 
-#: ../gnome-about/gnome-about.in:897
+#: ../gnome-about/gnome-about.in:890
 msgid "Brought to you by:"
 msgstr "Veidotāji:"
 
-#: ../gnome-about/gnome-about.in:921
+#: ../gnome-about/gnome-about.in:914
 msgid "<b>%(name)s:</b> %(value)s"
 msgstr "<b>%(name)s:</b> %(value)s"
 
-#: ../gnome-about/gnome-about.in:977
+#: ../gnome-about/gnome-about.in:975
 msgid "Version"
 msgstr "Versija"
 
-#: ../gnome-about/gnome-about.in:978
+#: ../gnome-about/gnome-about.in:977
 msgid "Distributor"
 msgstr "Izplatītājs"
 
@@ -97,7 +100,7 @@
 msgid "Build Date"
 msgstr "Būvējuma datums"
 
-#: ../gnome-about/gnome-about.in:1023
+#: ../gnome-about/gnome-about.in:1024
 msgid "Display information on this GNOME version"
 msgstr "Informācija par šo GNOME versiju"
 
@@ -106,8 +109,8 @@
 "GNOME also includes a complete development platform for applications "
 "programmers, allowing the creation of powerful and complex applications."
 msgstr ""
-"GNOME sevī iekļauj arī pilnvērtīgu programmatūras izstrādes platformu, kas "
-"ļauj veidot dažādas daudzfunkcionālas un sarežģītas programmas."
+"GNOME sastāvā ir arī pilnvērtīga programmatūras izstrādes platforma, kas "
+"ļauj veidot daudzfunkcionālas un jaudīgas programmas."
 
 #: ../gnome-version.xml.in.in.h:2
 msgid ""
@@ -133,16 +136,15 @@
 "GNOME's focus on usability and accessibility, regular release cycle, and "
 "strong corporate backing make it unique among Free Software desktops."
 msgstr ""
-"GNOMEs fokusēšanās uz lietojamību un pieejamību, regulārs jaunu versiju "
-"prezentēšanas cikls un spēcīgi korporatīvie sakari padara to unikālu starp "
-"Brīvās Programmatūras darbvidēm."
+"GNOME raksturīgās iezīmes ir uzsvars uz lietojamību un pieejamību, regulārs "
+"laidienu cikls un spēcīgs korporatīvais atbalsts."
 
 #: ../gnome-version.xml.in.in.h:8
 msgid ""
 "GNOME's greatest strength is our strong community. Virtually anyone, with or "
 "without coding skills, can contribute to making GNOME better."
 msgstr ""
-"GNOME lielākais spēks slēpjas kopienā. Praktiski, jebkurš, ar vai bez "
+"GNOME lielākais spēks slēpjas kopienā. Praktiski jebkurš, ar vai bez "
 "programmēšanas iemaņām, var līdzdarboties, lai padarītu GNOME labāku."
 
 #: ../gnome-version.xml.in.in.h:9
@@ -151,138 +153,174 @@
 "1997; many more have contributed in other important ways, including "
 "translations, documentation, and quality assurance."
 msgstr ""
-"Simtiem cilvēku ir dalījušies ar savu izstrādes kodu, jau no pašiem GNOME "
-"sākumiem kopš 1997. gada; vēl vairāk cilvēku ir palīdzējuši citos nozīmīgos "
-"veidos, kā tulkošana, dokumentācijas rakstīšana, un kvalitātes pārbaude."
-
-#: ../libgnome-desktop/display-name.c:213
-msgid "Laptop"
-msgstr "Klēpjdators"
-
-#: ../libgnome-desktop/display-name.c:221
+"Simtiem programmētāju ir ieguldījuši savu darbu GNOME projektā kopš tā "
+"uzsākšanas 1997. gadā; vēl vairāk cilvēku ir palīdzējuši citos nozīmīgos "
+"veidos - tulkojot, rakstot dokumentāciju un nodrošinot kvalitātes pārbaudi."
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+#| msgid "Unknown"
+msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:218
+#: ../libgnome-desktop/gnome-desktop-item.c:220
 #, c-format
 msgid "Error reading file '%s': %s"
-msgstr "Kļūda lasot failu '%s': %s"
+msgstr "Kļūda, lasot failu '%s': %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:286
+#: ../libgnome-desktop/gnome-desktop-item.c:288
 #, c-format
 msgid "Error rewinding file '%s': %s"
-msgstr "Kļūda atgriežot failu '%s': %s"
+msgstr "Kļūda, atgriežot failu '%s': %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:388
-#: ../libgnome-desktop/gnome-desktop-item.c:3530
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
 msgid "No name"
 msgstr "Bez nosaukuma"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:615
+#: ../libgnome-desktop/gnome-desktop-item.c:607
 #, c-format
 msgid "File '%s' is not a regular file or directory."
-msgstr "Fails '%s' nav parasts fails vai direktorija."
+msgstr "Fails '%s' nav parasts fails vai mape."
 
-#: ../libgnome-desktop/gnome-desktop-item.c:799
+#: ../libgnome-desktop/gnome-desktop-item.c:791
 #, c-format
-msgid "Error cannot find file id '%s'"
-msgstr "Kļūda, nevaru atrast faila id '%s'"
+#| msgid "Error cannot find file id '%s'"
+msgid "Cannot find file '%s'"
+msgstr "Nevar atrast failu '%s'"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:845
+#: ../libgnome-desktop/gnome-desktop-item.c:837
 #, c-format
 msgid "No filename to save to"
-msgstr "Nav faila nosaukuma, uz kuru saglabāt"
+msgstr "Nav faila nosaukuma, kurā saglabāt"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:1830
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
 #, c-format
 msgid "Starting %s"
-msgstr "Sāknēju %s"
+msgstr "Palaiž %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2066
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
 #, c-format
 msgid "No URL to launch"
-msgstr "Nav URL, kuru palaist"
+msgstr "Nav URL, ko palaist"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2082
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
 #, c-format
 msgid "Not a launchable item"
 msgstr "Nav palaižamas vienības"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2092
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
 #, c-format
 msgid "No command (Exec) to launch"
 msgstr "Nav komandas (Exec), ko palaist"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2105
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
 #, c-format
 msgid "Bad command (Exec) to launch"
 msgstr "Slikta komanda (Exec), ko palaist"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:3586
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
 #, c-format
 msgid "Unknown encoding of: %s"
 msgstr "Nezināms kodējums: %s"
 
-#: ../libgnome-desktop/gnome-desktop-utils.c:130
+#: ../libgnome-desktop/gnome-desktop-utils.c:133
 msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr "Nevar atrast termināli, izmanto xterm, neskatoties uz to, ka tas varētu nestrādāt"
+msgstr "Nevar atrast termināli; lieto xterm, lai gan tas varētu nestrādāt"
 
-#: ../libgnome-desktop/gnome-rr.c:346
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
-msgid "could not get the range of screen sizes"
-msgstr "nevar iegūt ekrāna izmēru diapazonu"
+msgid "could not get the screen resources (CRTCs, outputs, modes)"
+msgstr "neizdevās iegūt ekrāna resursus (CRTC, izvadus, režīmus)"
 
-#: ../libgnome-desktop/gnome-rr.c:355
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
-msgstr "neapstrādāta X kļūda iegūstot ekrāna izmēru diapazonu"
+msgstr "neapstrādāta X kļūda, iegūstot ekrāna izmēru diapazonu"
 
-#: ../libgnome-desktop/gnome-rr.c:444
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
-msgid "could not get the screen resources (CRTCs, outputs, modes)"
-msgstr "nevar iegūt ekrāna resursus (CRTC, izvadus, režīmus)"
+msgid "could not get the range of screen sizes"
+msgstr "neizdevās iegūt ekrāna izmēru diapazonu"
 
-#: ../libgnome-desktop/gnome-rr.c:579
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "RANDR paplašinājums nav pieejams"
 
-#: ../libgnome-desktop/gnome-rr.c:809
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
-msgstr "nevar atrast informāciju par izvadu %d"
+msgstr "neizdevās atrast informāciju par izvadu %d"
 
-#: ../libgnome-desktop/gnome-rr.c:1107
+#. Translators: the "position", "size", and "maximum"
+#. * words here are not keywords; please translate them
+#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position=(%"
 "d, %d), size=(%d, %d), maximum=(%d, %d)"
-msgstr "pieprasītā CRTC %d pozīcija/izmērs ir ārpus pieļaujamajiem limitiem: pozīcija=(%d, %d), izmērs=(%d, %d), maksimums=(%d, %d)"
+msgstr ""
+"pieprasītā CRTC %d pozīcija/izmērs ir ārpus pieļaujamās robežas: "
+"pozīcija=(%d, %d), izmērs=(%d, %d), maksimums=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1140
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
-msgstr "nevar uzstādīt CRTC %d konfigurāciju"
+msgstr "neizdevās iestatīt CRTC %d konfigurāciju"
 
-#: ../libgnome-desktop/gnome-rr.c:1249
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
-msgstr "nevar atrast informāciju par CRTC %d"
+msgstr "neizdevās atrast informāciju par CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1152
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "Klēpjdators"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
-msgid "none of the saved display configurations matched the active configuration"
-msgstr "neviena no saglabātajām ekrāna konfigurācijām neatbilst aktīvajai konfigurācijai"
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"neviena no saglabātajām ekrāna konfigurācijām neatbilst aktīvajai "
+"konfigurācijai"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1550
+#. Translators: the "requested", "minimum", and
+#. * "maximum" words here are not keywords; please
+#. * translate them as usual.
+#: ../libgnome-desktop/gnome-rr-config.c:1689
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
-msgstr "pieprasītais virtuālais izmērs neatbilst pieejamajiem izmēriem: pieprasīts=(%d, %d), minimums=(%d, %d), maksimums=(%d, %d)"
+msgstr ""
+"pieprasītais virtuālais izmērs neatbilst pieejamajam izmēram: "
+"pieprasīts=(%d, %d), minimums=(%d, %d), maksimums=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1564
+#: ../libgnome-desktop/gnome-rr-config.c:1703
 #, c-format
 msgid "could not find a suitable configuration of screens"
-msgstr "nevar atrast piemērotu ekrānu konfigurāciju"
+msgstr "neizdevās atrast piemērotu ekrānu konfigurāciju"
+
+#. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
+#. Translators:  this is the feature where what you see on your laptop's
+#. * screen is the same as your external monitor.  Here, "Mirror" is being
+#. * used as an adjective, not as a verb.  For example, the Spanish
+#. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
+#.
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
+msgid "Mirror Screens"
+msgstr "Spoguļekrāni"
+
 
diff -Nru gnome-desktop-2.30.0/po/Makefile.in.in gnome-desktop-2.30.2/po/Makefile.in.in
--- gnome-desktop-2.30.0/po/Makefile.in.in	2010-03-30 23:14:44.000000000 +0200
+++ gnome-desktop-2.30.2/po/Makefile.in.in	2010-06-22 03:42:15.000000000 +0200
@@ -56,7 +56,7 @@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
@@ -129,7 +129,7 @@
 	done
 
 # Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
 
 # Define this as empty until I found a useful application.
 install-exec installcheck:
diff -Nru gnome-desktop-2.30.0/po/mr.po gnome-desktop-2.30.2/po/mr.po
--- gnome-desktop-2.30.0/po/mr.po	2009-09-21 18:10:31.000000000 +0200
+++ gnome-desktop-2.30.2/po/mr.po	2010-06-22 03:40:37.000000000 +0200
@@ -4,15 +4,15 @@
 # Swapnil Hajare <dreamil1000a@yahoo.com>, 2003.
 # Rahul Bhalerao <b.rahul.pm@gmail.com>, 2006.
 # Sandeep Shedmake <sandeep.shedmake@gmail.com>, 2008, 2009.
-# Sandeep Shedmake <sshedmak@redhat.com>, 2009.
+# Sandeep Shedmake <sshedmak@redhat.com>, 2009, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&component=general\n"
-"POT-Creation-Date: 2009-08-19 19:24+0000\n"
-"PO-Revision-Date: 2009-09-11 17:21+0530\n"
+"POT-Creation-Date: 2010-04-09 07:24+0000\n"
+"PO-Revision-Date: 2010-04-13 11:56+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
-"Language-Team: Marathi <fedora-trans-mr@redhat.com>\n"
+"Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -153,11 +153,11 @@
 "अनेकांनी निरनिराळ्या महत्वाच्या मार्गांनी योगदान केले आहे, ज्यात अनुवाद, दस्तऐवजीकरण, आणि "
 "दर्जा हमी यांचा समावेश होतो."
 
-#: ../libgnome-desktop/display-name.c:262
-msgid "Laptop"
-msgstr "लॅपटॉप"
-
-#: ../libgnome-desktop/display-name.c:270
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "अपरिचीत"
 
@@ -173,56 +173,61 @@
 
 # libgnome-desktop/gnome-desktop-item.c:334
 # libgnome-desktop/gnome-desktop-item.c:3026
-#: ../libgnome-desktop/gnome-desktop-item.c:377
-#: ../libgnome-desktop/gnome-desktop-item.c:3519
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
 msgid "No name"
 msgstr "कोणतेही नाव नाही"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:604
+#: ../libgnome-desktop/gnome-desktop-item.c:607
 #, c-format
 msgid "File '%s' is not a regular file or directory."
 msgstr "फाइल '%s' सामान्य फाइल किंवा डायरेक्ट्री नाही आहे."
 
 # libgnome-desktop/gnome-desktop-item.c:3307
-#: ../libgnome-desktop/gnome-desktop-item.c:788
+#: ../libgnome-desktop/gnome-desktop-item.c:791
 #, c-format
-msgid "Error cannot find file id '%s'"
-msgstr "फाइल आइडी '%s' सापडला नाही"
+msgid "Cannot find file '%s'"
+msgstr "फाइल '%s' आढळली नाही"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:834
+#: ../libgnome-desktop/gnome-desktop-item.c:837
 #, c-format
 msgid "No filename to save to"
 msgstr "संचयीत करण्यासाठी कोणतेही फाइल-नाव दिले गेले नाही"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:1819
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
 #, c-format
 msgid "Starting %s"
 msgstr "%s सुरु करत आहे"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2055
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
 #, c-format
 msgid "No URL to launch"
 msgstr "कोणताही URL उपलब्ध नाही"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2071
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
 #, c-format
 msgid "Not a launchable item"
 msgstr "चालवण्यायोग्य प्रोग्राम उपलब्ध नाही"
 
 # libgnome-desktop/gnome-desktop-item.c:1565
-#: ../libgnome-desktop/gnome-desktop-item.c:2081
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
 #, c-format
 msgid "No command (Exec) to launch"
 msgstr "चालवण्यायोग्य आदेश (Exec) उपलब्ध नाही"
 
 # libgnome-desktop/gnome-desktop-item.c:1578
-#: ../libgnome-desktop/gnome-desktop-item.c:2094
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
 #, c-format
 msgid "Bad command (Exec) to launch"
 msgstr "चालवण्यायोग्य आदेश(प्रोग्राम) खराब आहे"
 
 # libgnome-desktop/gnome-desktop-item.c:3083
-#: ../libgnome-desktop/gnome-desktop-item.c:3575
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
 #, c-format
 msgid "Unknown encoding of: %s"
 msgstr "%s ची अज्ञात एनकोडिंग"
@@ -231,27 +236,28 @@
 msgid "Cannot find a terminal, using xterm, even if it may not work"
 msgstr "टर्मिनल आढळले नाही, xterm चा वापर करत आहे, जरी ते कार्य करत नसेल"
 
-#: ../libgnome-desktop/gnome-rr.c:405
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "पडदा स्त्रोत (CRTCs, आऊटपुट, पद्धती) प्राप्त करणे अशक्य"
 
-#: ../libgnome-desktop/gnome-rr.c:425
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "पडदा आकाराचे क्षेत्र प्राप्त करतेवेळी न हाताळलेली X त्रुटी आढळली"
 
-#: ../libgnome-desktop/gnome-rr.c:431
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "पडदा आकारचे क्षेत्र प्राप्त करू शकले नाही"
 
-#: ../libgnome-desktop/gnome-rr.c:657
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "RANDR वाढ आढळले नाही"
 
-#: ../libgnome-desktop/gnome-rr.c:923
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
 msgstr "आउटपुट %d विषयी माहिती प्राप्त करण्यास अशक्य"
@@ -259,7 +265,7 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:1261
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position=(%"
@@ -268,17 +274,21 @@
 "CRTC %d करीता विनंतीकृत ठिकाण/आकार स्वीकार्य मर्यादा पलीकडे आहे: position(%d, %d), "
 "size=(%d, %d), maximum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1297
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "CRTC %d करीता संयोजना निश्चित करू शकले नाही"
 
-#: ../libgnome-desktop/gnome-rr.c:1409
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "CRTC %d विषयी माहिती प्राप्त करणे शक्य नाही"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1159
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "लॅपटॉप"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
 msgid "none of the saved display configurations matched the active configuration"
 msgstr "साठवलेले प्रदर्शन संयोजना पैकी सक्रीय संयोजनाशी जुळू शकले नाही"
@@ -286,7 +296,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1682
+#: ../libgnome-desktop/gnome-rr-config.c:1689
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -295,7 +305,7 @@
 "आवश्यक आभासी आकार उपलब्ध आकारात घट्ट बसत नाही: requested=(%d, %d), minimum=(%d, "
 "%d), maximum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1696
+#: ../libgnome-desktop/gnome-rr-config.c:1703
 #, c-format
 msgid "could not find a suitable configuration of screens"
 msgstr "योग्य पडद्याची संयोजना आढळले नाही"
@@ -306,7 +316,7 @@
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../libgnome-desktop/gnome-rr-labeler.c:210
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
 msgid "Mirror Screens"
 msgstr "मीरर सक्रीन्स्"
 
diff -Nru gnome-desktop-2.30.0/po/ms.po gnome-desktop-2.30.2/po/ms.po
--- gnome-desktop-2.30.0/po/ms.po	2010-02-09 01:41:15.000000000 +0100
+++ gnome-desktop-2.30.2/po/ms.po	2010-04-09 10:48:05.000000000 +0200
@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-desktop HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&component=general\n"
-"POT-Creation-Date: 2009-08-19 19:24+0000\n"
-"PO-Revision-Date: 2010-01-18 07:40+0730\n"
-"Last-Translator: Umarzuki bin Mochlis Moktar <umarzuki@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-04-06 23:34+0300\n"
+"PO-Revision-Date: 2010-04-03 22:10+0800\n"
+"Last-Translator: Ahmed Noor Kader Mustajir Md Eusoff <sir.ade@gmail.com>\n"
 "Language-Team: Projek Gabai <gabai-penyumbang@lists.sf.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,39 +99,67 @@
 msgstr "Papar maklumat mengenai versi GNOME ini"
 
 #: ../gnome-version.xml.in.in.h:1
-msgid "GNOME also includes a complete development platform for applications programmers, allowing the creation of powerful and complex applications."
-msgstr "GNOME juga disertakan dengan satu platform pembangunan bagi pengaturcara aplikasi, membolehkan penciptaan aplikasi yang berkuasan dan kompleks."
+msgid ""
+"GNOME also includes a complete development platform for applications "
+"programmers, allowing the creation of powerful and complex applications."
+msgstr ""
+"GNOME juga disertakan dengan satu platform pembangunan bagi pengaturcara "
+"aplikasi, membolehkan penciptaan aplikasi yang berkuasan dan kompleks."
 
 #: ../gnome-version.xml.in.in.h:2
-msgid "GNOME includes most of what you see on your computer, including the file manager, web browser, menus, and many applications."
-msgstr "GNOME disertakan kebanyakan drpd apa yang anda lihat pada komputer anda, termasuk pengurus fail, pelungsur web, menu dan banyak aplikasi."
+msgid ""
+"GNOME includes most of what you see on your computer, including the file "
+"manager, web browser, menus, and many applications."
+msgstr ""
+"GNOME disertakan kebanyakan drpd apa yang anda lihat pada komputer anda, "
+"termasuk pengurus fail, pelungsur web, menu dan banyak aplikasi."
 
 #. NOTE TO AUTHORS: Do not put anything in the following paragraphs that
 #. will be substituted by the configure script. Otherwise you will break
 #. the translations.
 #: ../gnome-version.xml.in.in.h:6
-msgid "GNOME is a Free, usable, stable, accessible desktop environment for the Unix-like family of operating systems."
-msgstr "GNOME adalah persekitaran desktop yang Bebas, bolehguna, stabil, bolehcapai bagi sistem pengoperasian keluarga seperti-Unix."
+msgid ""
+"GNOME is a Free, usable, stable, accessible desktop environment for the Unix-"
+"like family of operating systems."
+msgstr ""
+"GNOME adalah persekitaran desktop yang Bebas, bolehguna, stabil, bolehcapai "
+"bagi sistem pengoperasian keluarga seperti-Unix."
 
 #: ../gnome-version.xml.in.in.h:7
-msgid "GNOME's focus on usability and accessibility, regular release cycle, and strong corporate backing make it unique among Free Software desktops."
-msgstr "Tumpuan GNOME pada kebolehgunaan dan kebolehcapaian, kitaran keluaran biasa, dan sokongan korporat yang kuat membuatkan ia unik di antara desktop Perisian Bebas."
+msgid ""
+"GNOME's focus on usability and accessibility, regular release cycle, and "
+"strong corporate backing make it unique among Free Software desktops."
+msgstr ""
+"Tumpuan GNOME pada kebolehgunaan dan kebolehcapaian, kitaran keluaran biasa, "
+"dan sokongan korporat yang kuat membuatkan ia unik di antara desktop "
+"Perisian Bebas."
 
 #: ../gnome-version.xml.in.in.h:8
-msgid "GNOME's greatest strength is our strong community. Virtually anyone, with or without coding skills, can contribute to making GNOME better."
-msgstr "Kekuatan GNOME terkuat adalah komuniti yang kuat. Secara virtual semua orang, dengan atau tanpa kemahiran mengkod, boleh menyumbang untuk menjadukan GNOME lebih baik."
+msgid ""
+"GNOME's greatest strength is our strong community. Virtually anyone, with or "
+"without coding skills, can contribute to making GNOME better."
+msgstr ""
+"Kekuatan GNOME terkuat adalah komuniti yang kuat. Secara virtual semua "
+"orang, dengan atau tanpa kemahiran mengkod, boleh menyumbang untuk "
+"menjadukan GNOME lebih baik."
 
 #: ../gnome-version.xml.in.in.h:9
-msgid "Hundreds of people have contributed code to GNOME since it was started in 1997; many more have contributed in other important ways, including translations, documentation, and quality assurance."
-msgstr "Beratus-ratus orang telah menyumbangkan kod ke GNOME sejak ia ditubuhkan pada 1997, banyak lagi telah menyumbangkan dalam bentuk penting lain, termasuk terjemahan, dokumentasi, dan pemeriksaan kualiti."
-
-#: ../libgnome-desktop/display-name.c:262
-msgid "Laptop"
-msgstr "Komputer riba"
-
-#: ../libgnome-desktop/display-name.c:270
+msgid ""
+"Hundreds of people have contributed code to GNOME since it was started in "
+"1997; many more have contributed in other important ways, including "
+"translations, documentation, and quality assurance."
+msgstr ""
+"Beratus-ratus orang telah menyumbangkan kod ke GNOME sejak ia ditubuhkan "
+"pada 1997, banyak lagi telah menyumbangkan dalam bentuk penting lain, "
+"termasuk terjemahan, dokumentasi, dan pemeriksaan kualiti."
+
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+msgctxt "Monitor vendor"
 msgid "Unknown"
-msgstr "Tak diketahui"
+msgstr "Tidak diketahui"
 
 #: ../libgnome-desktop/gnome-desktop-item.c:220
 #, c-format
@@ -143,81 +171,89 @@
 msgid "Error rewinding file '%s': %s"
 msgstr "Ralat rewind fail '%s': %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:377
-#: ../libgnome-desktop/gnome-desktop-item.c:3519
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
 msgid "No name"
 msgstr "Tiada Nama"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:604
+#: ../libgnome-desktop/gnome-desktop-item.c:607
 #, c-format
 msgid "File '%s' is not a regular file or directory."
 msgstr "Fail '%s' adalah bukan fail atau direktori biasa"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:788
+#: ../libgnome-desktop/gnome-desktop-item.c:791
 #, c-format
-msgid "Error cannot find file id '%s'"
-msgstr "Ralat tidak jumpa id fail '%s'"
+msgid "Cannot find file '%s'"
+msgstr "Tidak dapat jumpa fail '%s'"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:834
+#: ../libgnome-desktop/gnome-desktop-item.c:837
 #, c-format
 msgid "No filename to save to"
 msgstr "Tiada namafail untuk disimpan"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:1819
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
 #, c-format
 msgid "Starting %s"
 msgstr "Memulakan %s"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2055
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
 #, c-format
 msgid "No URL to launch"
 msgstr "Tiada URL untuk dilancarkan"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2071
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
 #, c-format
 msgid "Not a launchable item"
 msgstr "Tiada item boleh dilancarkan"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2081
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
 #, c-format
 msgid "No command (Exec) to launch"
 msgstr "Tiada arahan (Exec) untuk dilancarkan"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2094
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
 #, c-format
 msgid "Bad command (Exec) to launch"
 msgstr "Arahan (Exec) untuk dilancarkan adalah salah"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:3575
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
 #, c-format
 msgid "Unknown encoding of: %s"
 msgstr "Pengkodan tidak diketahui: %s"
 
 #: ../libgnome-desktop/gnome-desktop-utils.c:133
 msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr "Tidak menjumpai terminal, menggunakan xterm meskipun ia mungkin tidak boleh dijalankan"
+msgstr ""
+"Tidak menjumpai terminal, menggunakan xterm meskipun ia mungkin tidak boleh "
+"dijalankan"
 
-#: ../libgnome-desktop/gnome-rr.c:405
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "tidak dapat "
 
-#: ../libgnome-desktop/gnome-rr.c:425
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "ralat X tak dapat ditangani semasa mendapatkan julat saiz skrin"
 
-#: ../libgnome-desktop/gnome-rr.c:431
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "tidak mendapat julat saiz skrin"
 
-#: ../libgnome-desktop/gnome-rr.c:657
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "Sambungan RANDR tiada"
 
-#: ../libgnome-desktop/gnome-rr.c:923
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
 msgstr "tidak dapat maklumat output %d"
@@ -225,35 +261,50 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:1261
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
-msgid "requested position/size for CRTC %d is outside the allowed limit: position=(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-msgstr "posisi/saiz CRTC %d yang diminta berada di luar had dibenarkan: posisi=(%d, %d), saiz=(%d, %d), maksimum=(%d, %d)"
+msgid ""
+"requested position/size for CRTC %d is outside the allowed limit: position=(%"
+"d, %d), size=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"posisi/saiz CRTC %d yang diminta berada di luar had dibenarkan: posisi=(%d, %"
+"d), saiz=(%d, %d), maksimum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1297
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "tidak dapat menetapkan konfigurasi untuk CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr.c:1409
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "tidak dapat maklumat tentang CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1159
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "Komputer riba"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
-msgid "none of the saved display configurations matched the active configuration"
-msgstr "tiada satu pun konfigurasi paparan tersimpan sepadan dengan konfigurasi aktif "
+msgid ""
+"none of the saved display configurations matched the active configuration"
+msgstr ""
+"tiada satu pun konfigurasi paparan tersimpan sepadan dengan konfigurasi "
+"aktif "
 
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1682
+#: ../libgnome-desktop/gnome-rr-config.c:1689
 #, c-format
-msgid "required virtual size does not fit available size: requested=(%d, %d), minimum=(%d, %d), maximum=(%d, %d)"
-msgstr "saiz maya yang diperlukan tidak muat saiz sedia ada: diminta=(%d, %d), minimum=(%d, %d), maksimum=(%d, %d)"
+msgid ""
+"required virtual size does not fit available size: requested=(%d, %d), "
+"minimum=(%d, %d), maximum=(%d, %d)"
+msgstr ""
+"saiz maya yang diperlukan tidak muat saiz sedia ada: diminta=(%d, %d), "
+"minimum=(%d, %d), maksimum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1696
+#: ../libgnome-desktop/gnome-rr-config.c:1703
 #, c-format
 msgid "could not find a suitable configuration of screens"
 msgstr "tidak dapat cari konfigurasi skrin yang sesuai"
@@ -264,6 +315,6 @@
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../libgnome-desktop/gnome-rr-labeler.c:210
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
 msgid "Mirror Screens"
 msgstr "Skrin-skrin cermin"
diff -Nru gnome-desktop-2.30.0/po/nb.po gnome-desktop-2.30.2/po/nb.po
--- gnome-desktop-2.30.0/po/nb.po	2010-03-04 16:38:07.000000000 +0100
+++ gnome-desktop-2.30.2/po/nb.po	2010-06-22 03:40:37.000000000 +0200
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-desktop 2.29.x\n"
-"Report-Msgid-Bugs-To:\n"
-"POT-Creation-Date: 2010-03-03 16:44+0100\n"
-"PO-Revision-Date: 2010-03-03 17:07+0100\n"
+"Project-Id-Version: gnome-desktop 2.31.x\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-06-20 13:11+0200\n"
+"PO-Revision-Date: 2010-06-20 13:13+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian (bokmål) <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -228,27 +228,28 @@
 msgstr ""
 "Kan ikke finne en terminal. Buker xterm selv om den kanskje ikke virker"
 
-#: ../libgnome-desktop/gnome-rr.c:442
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "kunne ikke hente skjermressurser (CRTCer, utdata, modus)"
 
-#: ../libgnome-desktop/gnome-rr.c:462
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "uhåndtert X-feil under henting av område med skjermstørrelser"
 
-#: ../libgnome-desktop/gnome-rr.c:468
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "kunne ikke hente område med skjermstørrelser"
 
-#: ../libgnome-desktop/gnome-rr.c:713
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "RANDR-tillegget er ikke tilstede"
 
-#: ../libgnome-desktop/gnome-rr.c:1032
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
 msgstr "kunne ikke hente informasjon om utdata %d"
@@ -256,7 +257,7 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:1419
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position=(%"
@@ -265,30 +266,91 @@
 "forespurt posisjon/størrelse for CRTC %d er utenfor tillatt område: posisjon="
 "(%d, %d), størrelse=(%d, %d), maksimum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1455
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "kunne ikke sette konfigurasjon for CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr.c:1571
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "kunne ikke hente informasjon om CRTC %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:500
+#: ../libgnome-desktop/gnome-rr-config.c:501
 msgid "Laptop"
 msgstr "Bærbar"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1161
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
 msgid ""
 "none of the saved display configurations matched the active configuration"
 msgstr "ingen av de lagrede skjermkonfigurasjonene var lik aktiv konfigurasjon"
 
+#: ../libgnome-desktop/gnome-rr-config.c:1423
+#, c-format
+msgid "CRTC %d cannot drive output %s"
+msgstr "CRTC %d kan ikke drive utdata %s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1430
+#, c-format
+msgid "output %s does not support mode %dx%d@%dHz"
+msgstr "utdata %s støtter ikke modus %dx%d@%dHz"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1441
+#, c-format
+msgid "CRTC %d does not support rotation=%s"
+msgstr "CRTC %d støtter ikke rotation=%s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1455
+#, c-format
+msgid ""
+"output %s does not have the same parameters as another cloned output:\n"
+"existing mode = %d, new mode = %d\n"
+"existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
+"existing rotation = %s, new rotation = %s"
+msgstr ""
+"utdata %s har ikke samme parametere som en annen klonet utdata:\n"
+"eksisterende modus = %d, ny modus = %d\n"
+"eksisterende koordinater = (%d, %d), nye koordinater = (%d, %d)\n"
+"eksisterende rotasjon = %s, ny rotasjon = %s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1470
+#, c-format
+msgid "cannot clone to output %s"
+msgstr "kan ikke klone til utgang %s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1639
+#, c-format
+msgid "Trying modes for CRTC %d\n"
+msgstr "Prøver modus for CRTC %d\n"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1663
+#, c-format
+msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
+msgstr "CRTC %d: prøver modus %dx%d@%dHz med utdata %dx%d@%dHz (forsøk %d)\n"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1710
+#, c-format
+msgid ""
+"could not assign CRTCs to outputs:\n"
+"%s"
+msgstr ""
+"kunne ikke tilegne CRTCer til utdata:\n"
+"%s"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1714
+#, c-format
+msgid ""
+"none of the selected modes were compatible with the possible modes:\n"
+"%s"
+msgstr ""
+"ingen av de valgte modusene var kompatibel med mulige modus:\n"
+"%s"
+
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1688
+#: ../libgnome-desktop/gnome-rr-config.c:1796
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -297,17 +359,12 @@
 "nødvendig virtuell størrelse passer ikke med tilgjengelig størrelse: "
 "forespurt=(%d, %d), minimum=(%d, %d), maksimum=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1702
-#, c-format
-msgid "could not find a suitable configuration of screens"
-msgstr "kunne ikke finne en passende skjermkonfigurasjon"
-
 #. Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name()
 #. Translators:  this is the feature where what you see on your laptop's
 #. * screen is the same as your external monitor.  Here, "Mirror" is being
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../libgnome-desktop/gnome-rr-labeler.c:210
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
 msgid "Mirror Screens"
 msgstr "Speil skjermer"
diff -Nru gnome-desktop-2.30.0/po/or.po gnome-desktop-2.30.2/po/or.po
--- gnome-desktop-2.30.0/po/or.po	2009-08-25 15:15:52.000000000 +0200
+++ gnome-desktop-2.30.2/po/or.po	2010-06-22 03:40:37.000000000 +0200
@@ -1,31 +1,32 @@
-# translation of or.po to Oriya
+# translation of gnome-desktop.gnome-2-30.or.po to Oriya
 # Oriya translation of gnome-desktop.HEAD.pot.
-# Copyright (C) 2006, 2008, 2009, Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2009, 2010, Free Software Foundation, Inc.
 # This file is distributed under the same license as the gnome-desktop package.
 # $Id: or.po,v 1.1 2006/04/30 13:17:46 gmohanty Exp $
 #
 # Hariram Pansari <hrpansari@vsnl.net>, 2006.
 # Manoj Kumar Giri <giri.manojkr@gmail.com>, 2008.
-# Manoj Kumar Giri <mgiri@redhat.com>, 2009.
+# Manoj Kumar Giri <mgiri@redhat.com>, 2009, 2010.
 msgid ""
 msgstr ""
-"Project-Id-Version: or\n"
+"Project-Id-Version: gnome-desktop.gnome-2-30.or\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-desktop&component=general\n"
-"POT-Creation-Date: 2009-08-19 19:24+0000\n"
-"PO-Revision-Date: 2009-08-25 18:40+0530\n"
+"POT-Creation-Date: 2010-04-09 07:24+0000\n"
+"PO-Revision-Date: 2010-05-17 23:46+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
-"Language-Team: Oriya <oriya-it@googlegroups.com>\n"
+"Language-Team: Oriya <Translation-team-or@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=2; plural=(n!=1);\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"\n"
 "\n"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:1
 #: ../gnome-about/gnome-about.in:60
 msgid "About GNOME"
-msgstr "ନୋମ ବିଷୟରେ"
+msgstr "GNOME ବିଷୟରେ"
 
 #: ../gnome-about/gnome-about.desktop.in.in.h:2
 msgid "Learn more about GNOME"
@@ -37,7 +38,7 @@
 
 #: ../gnome-about/gnome-about.in:62
 msgid "GNOME Library"
-msgstr "ନୋମ ଲାଇବ୍ରେରୀ"
+msgstr "ନୋମ  ଲାଇବ୍ରେରୀ"
 
 #: ../gnome-about/gnome-about.in:63
 msgid "Friends of GNOME"
@@ -153,11 +154,13 @@
 "୧୯୯୭ ମସିହାରୁ ନୋମର ଆରମ୍ଭଠାରୁ, ଶହ ଶହ ଲୋକ କାରିକା ଲେଖିବାରେ ଯୋଗଦାନ ଦେଇଛନ୍ତି; ଆହୁରି ଅନେକ ଲୋକ "
 "ଅନ୍ଯ ମହତ୍ତ୍ବପୂର୍ଣ ଭାବରେ ଯୋଗଦାନ ଦେଇଛନ୍ତି, ଯେପରି କି ଅନୁବାଦ, ଦଲିଲିକରଣ, ଓ ଗୁଣବତ୍ତା ସ୍ବୀକୃତି."
 
-#: ../libgnome-desktop/display-name.c:262
-msgid "Laptop"
-msgstr "ଲ୍ୟାପଟପ"
-
-#: ../libgnome-desktop/display-name.c:270
+#. Translators: "Unknown" here is used to identify a monitor for which
+#. * we don't know the vendor. When a vendor is known, the name of the
+#. * vendor is used.
+#: ../libgnome-desktop/display-name.c:265
+#, fuzzy
+#| msgid "Unknown"
+msgctxt "Monitor vendor"
 msgid "Unknown"
 msgstr "ଅଜଣା"
 
@@ -173,85 +176,92 @@
 
 # libgnome-desktop/gnome-desktop-item.c:334
 # libgnome-desktop/gnome-desktop-item.c:3026
-#: ../libgnome-desktop/gnome-desktop-item.c:377
-#: ../libgnome-desktop/gnome-desktop-item.c:3519
+#. Translators: the "name" mentioned
+#. * here is the name of an application or
+#. * a document
+#. Translators: the "name" mentioned here is the name of
+#. * an application or a document
+#: ../libgnome-desktop/gnome-desktop-item.c:380
+#: ../libgnome-desktop/gnome-desktop-item.c:3524
 msgid "No name"
 msgstr "କୌଣସି ନାମ ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:604
+#: ../libgnome-desktop/gnome-desktop-item.c:607
 #, c-format
 msgid "File '%s' is not a regular file or directory."
 msgstr "'%s' ଫାଇଲ ସାଧାରଣ ଫାଇଲ ବା ଡିରେକ୍ଟୋରି ନୂହେଁ."
 
 # libgnome-desktop/gnome-desktop-item.c:3307
-#: ../libgnome-desktop/gnome-desktop-item.c:788
-#, c-format
-msgid "Error cannot find file id '%s'"
+#: ../libgnome-desktop/gnome-desktop-item.c:791
+#, fuzzy, c-format
+#| msgid "Error cannot find file id '%s'"
+msgid "Cannot find file '%s'"
 msgstr "'%s' ପରିଚୟର ଫାଇଲ ପାଇବାରେ ତ୍ରୁଟି"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:834
+#: ../libgnome-desktop/gnome-desktop-item.c:837
 #, c-format
 msgid "No filename to save to"
 msgstr "ସଂରକ୍ଷଣ ପାଇଁ କୌଣସି ଫାଇଲ ନାମ ଦିଆଯାଇ ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:1819
+#: ../libgnome-desktop/gnome-desktop-item.c:1822
 #, c-format
 msgid "Starting %s"
-msgstr "%s ପ୍ରାରମ୍ଭ ହେଉଛି"
+msgstr "%s କୁ ଆରମ୍ଭ କରୁଅଛି"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2055
+#: ../libgnome-desktop/gnome-desktop-item.c:2058
 #, c-format
 msgid "No URL to launch"
 msgstr "ଚଳାଇବା ପାଇଁ କୌଣସି ୟୁ.ଆର.ଏଲ. ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-desktop-item.c:2071
+#: ../libgnome-desktop/gnome-desktop-item.c:2074
 #, c-format
 msgid "Not a launchable item"
-msgstr "ଚଳନୀୟ ବସ୍ତୁ ନୁହେଁ"
+msgstr "ଗୋଟିଏ ଆରମ୍ଭ କରିବା ବସ୍ତୁ ନୁହଁ"
 
 # libgnome-desktop/gnome-desktop-item.c:1565
-#: ../libgnome-desktop/gnome-desktop-item.c:2081
+#: ../libgnome-desktop/gnome-desktop-item.c:2084
 #, c-format
 msgid "No command (Exec) to launch"
 msgstr "ଚଳାଇବା ପାଇଁ କୌଣସୀ ନିର୍ଦେଶ (ନିଷ୍ପାଦନ) ନାହିଁ"
 
 # libgnome-desktop/gnome-desktop-item.c:1578
-#: ../libgnome-desktop/gnome-desktop-item.c:2094
+#: ../libgnome-desktop/gnome-desktop-item.c:2097
 #, c-format
 msgid "Bad command (Exec) to launch"
 msgstr " ନିର୍ଦେଶ ଭୁଲ ନିର୍ଦେଶ (ନିଷ୍ପାଦନ)"
 
 # libgnome-desktop/gnome-desktop-item.c:3083
-#: ../libgnome-desktop/gnome-desktop-item.c:3575
+#: ../libgnome-desktop/gnome-desktop-item.c:3581
 #, c-format
 msgid "Unknown encoding of: %s"
 msgstr "%sର ସଙ୍କେତ ଅଜଣା"
 
 #: ../libgnome-desktop/gnome-desktop-utils.c:133
 msgid "Cannot find a terminal, using xterm, even if it may not work"
-msgstr "xterm ବ୍ୟବହାର କରି, ଟର୍ମିନାଲ ମିଳିଲା ନାହିଁ, ଯଦିଚ ଏହା କାମ କରିନଥାଏ"
+msgstr "କୌଣସି ଟର୍ମିନାଲ ମିଳିଲା ନାହିଁ. ଏକ୍ସଟର୍ମ ବ୍ଯବହାର କରାଯାଉଛି. ଏହା କାର୍ଯ୍ଯ ନ କରି ପାରେ"
 
-#: ../libgnome-desktop/gnome-rr.c:405
+#. Translators: a CRTC is a CRT Controller (this is X terminology).
+#: ../libgnome-desktop/gnome-rr.c:444
 #, c-format
 msgid "could not get the screen resources (CRTCs, outputs, modes)"
 msgstr "ପରଦା ଉତ୍ସଗୁଡ଼ିକୁ ପାଇଲା ନାହିଁ (CRTC ଗୁଡ଼ିକ, ଫଳାଫଳଗୁଡ଼ିକ, ଧାରାଗୁଡ଼ିକ)"
 
-#: ../libgnome-desktop/gnome-rr.c:425
+#: ../libgnome-desktop/gnome-rr.c:464
 #, c-format
 msgid "unhandled X error while getting the range of screen sizes"
 msgstr "ପରଦା ଆକାରର ସୀମା ପାଇବା ସମୟରେ ଅନିୟନ୍ତ୍ରିତ X ତ୍ରୁଟି"
 
-#: ../libgnome-desktop/gnome-rr.c:431
+#: ../libgnome-desktop/gnome-rr.c:470
 #, c-format
 msgid "could not get the range of screen sizes"
 msgstr "ପରଦା ଆକାରର ସୀମା ପାଇଲା ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-rr.c:657
+#: ../libgnome-desktop/gnome-rr.c:715
 #, c-format
 msgid "RANDR extension is not present"
 msgstr "RANDR ଅନୁଲଗ୍ନଟି ଉପସ୍ଥିତ ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-rr.c:923
+#: ../libgnome-desktop/gnome-rr.c:1037
 #, c-format
 msgid "could not get information about output %d"
 msgstr "ଫଳାଫଳ %d ବିଷୟରେ ସୂଚନା ପାଇଲା ନାହିଁ"
@@ -259,7 +269,7 @@
 #. Translators: the "position", "size", and "maximum"
 #. * words here are not keywords; please translate them
 #. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:1261
+#: ../libgnome-desktop/gnome-rr.c:1424
 #, c-format
 msgid ""
 "requested position/size for CRTC %d is outside the allowed limit: position=(%"
@@ -268,17 +278,21 @@
 "CRTC %d ପାଇଁ ଅନୁରୋଧିତ ସ୍ଥାନ/ଆକାର ସୀମା ବାହାରେ ଅଛି: ସ୍ଥିତି=(%d, %d), ଆକାର=(%d, %d), "
 "ସର୍ବାଧିକ=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr.c:1297
+#: ../libgnome-desktop/gnome-rr.c:1460
 #, c-format
 msgid "could not set the configuration for CRTC %d"
 msgstr "CRTC %d ପାଇଁ ବିନ୍ୟାସ ସେଟ କରିପାରିଲା ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-rr.c:1409
+#: ../libgnome-desktop/gnome-rr.c:1576
 #, c-format
 msgid "could not get information about CRTC %d"
 msgstr "CRTC %d ବିଷୟରେ ସୂଚନା ପାଇ ପାରିଲା ନାହିଁ"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1159
+#: ../libgnome-desktop/gnome-rr-config.c:501
+msgid "Laptop"
+msgstr "ଲ୍ୟାପଟପ"
+
+#: ../libgnome-desktop/gnome-rr-config.c:1162
 #, c-format
 msgid "none of the saved display configurations matched the active configuration"
 msgstr "ସଂରକ୍ଷିତ ପ୍ରଦର୍ଶନ ବିନ୍ୟାସଗୁଡ଼ିକ ମଧ୍ଯରୁ କୌଣସିଟି ସକ୍ରିୟ ବିନ୍ୟାସ ସହିତ ମେଳ ଖାଉନାହିଁ"
@@ -286,7 +300,7 @@
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1682
+#: ../libgnome-desktop/gnome-rr-config.c:1689
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
@@ -295,7 +309,7 @@
 "ଆବଶ୍ୟକୀୟ ଆଭାସୀ ଆକାର ଉପଲବ୍ଧ ଆକାର ସହିତ ମେଳ ହେଉନାହିଁ: ଅନୁରୋଧିତ=(%d, %d), ସର୍ବନିମ୍ନ=(%d, %"
 "d), ସର୍ବାଧିକ=(%d, %d)"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1696
+#: ../libgnome-desktop/gnome-rr-config.c:1703
 #, c-format
 msgid "could not find a suitable configuration of screens"
 msgstr "ପରଦାଗୁଡ଼ିକର ଉପଯୁକ୍ତ ବିନ୍ୟାସ ମିଳୁନାହିଁ"
@@ -306,7 +320,7 @@
 #. * used as an adjective, not as a verb.  For example, the Spanish
 #. * translation could be "Pantallas en Espejo", *not* "Espejar Pantallas".
 #.
-#: ../libgnome-desktop/gnome-rr-labeler.c:210
+#: ../libgnome-desktop/gnome-rr-labeler.c:212
 msgid "Mirror Screens"
-msgstr "ପ୍ରତିବିମ୍ବ ପରଦାଗୁଡ଼ିକ"
+msgstr "ପ୍ରତିଫଳକ ପରଦାଗୁଡ଼ିକ"
 
diff -Nru gnome-desktop-2.30.0/README gnome-desktop-2.30.2/README
--- gnome-desktop-2.30.0/README	2010-03-30 23:12:07.000000000 +0200
+++ gnome-desktop-2.30.2/README	2010-06-22 03:41:13.000000000 +0200
@@ -1,4 +1,4 @@
-gnome-desktop 2.30.0
+gnome-desktop 2.30.2
 ====================
 
 	This package is free software and is part of the