* New upstream release. Use chrpath to fix hardcoded rpath. Drop all patches.

 * New upstream release.
   Highlights:
   + Use the right gettext domain
   + Coding style improvements thanks to pylint
 * Use chrpath to fix hardcoded rpath.
 * Drop all patches:
   + patch 0001 included in new upstream release.
   + patch 2991 unneeded when using chrpath.

7 files changed, 20 insertions, 2998 deletions

diff --git a/debian/changelog b/debian/changelog
index 64c5dcb..ddc0fee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,13 @@
-sugar-base (0.79.0-7) unstable; urgency=low
+sugar-base (0.79.1-1) unstable; urgency=low
 
+  * New upstream release.
+    Highlights:
+    + Use the right gettext domain
+    + Coding style improvements thanks to pylint
+  * Use chrpath to fix hardcoded rpath.
+  * Drop all patches:
+    + patch 0001 included in new upstream release.
+    + patch 2991 unneeded when using chrpath.
   * Bump debhelper compatibility level to 6.
   * Update local cdbs snippets:
     + Update copyright-check cdbs snippet to store newline-delimited
@@ -8,6 +16,8 @@ sugar-base (0.79.0-7) unstable; urgency=low
       update-tarball.mk.
     + Relax python-central and python-support build-dependencies in
       python-autotools.mk.
+  * Stop using patchsystem-quilt.mk (no patches applied)
+  * Stop Regenerate automade files (irrelevant when using chrpath)
   * Semi-auto-update debian/control to update build-dependencies:
       DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
 
diff --git a/debian/control b/debian/control
index 7691c40..42d03de 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), debhelper (>= 5.0.44), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), dh-buildinfo, python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9)
+Build-Depends: cdbs (>= 0.4.39), autotools-dev, devscripts (>= 2.10.7), debhelper (>= 5.0.44), python-all-dev (>= 2.3.5-11), python-central (>= 0.5.6), dh-buildinfo, python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9), chrpath
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-base.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-base.git;a=summary
diff --git a/debian/patches/0001_upstream_git_until_56da6b0.patch b/debian/patches/0001_upstream_git_until_56da6b0.patch
deleted file mode 100644
index a97b628..0000000
--- a/debian/patches/0001_upstream_git_until_56da6b0.patch
+++ /dev/null
@@ -1,271 +0,0 @@
-diff --git a/autogen.sh b/autogen.sh
-new file mode 100755
-index 0000000..1cd5db4
---- /dev/null
-+++ b/autogen.sh
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+export ACLOCAL="aclocal -I m4"
-+
-+autoreconf -i
-+./configure "$@"
-diff --git a/maint-helper.py b/maint-helper.py
-new file mode 100755
-index 0000000..50f7d07
---- /dev/null
-+++ b/maint-helper.py
-@@ -0,0 +1,227 @@
-+#!/usr/bin/env python
-+
-+# Copyright (C) 2007, Red Hat, Inc.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+
-+# Latest source available at git://dev.laptop.org/sugar 
-+
-+import os
-+import sys
-+import re
-+import datetime
-+import subprocess
-+
-+source_exts = [ '.py', '.c', '.h', '.cpp' ]
-+
-+def is_source(path):
-+    for ext in source_exts:
-+        if path.endswith(ext):
-+            return True
-+
-+def get_name_and_version():
-+    f = open('configure.ac', 'r')
-+    config = f.read()
-+    f.close()
-+
-+    exp = 'AC_INIT\(\[[^\]]+\],\[([^\]]+)\],\[\],\[([^\]]+)\]'
-+    match = re.search(exp, config)
-+    if not match:
-+        print 'Cannot find the package name and version.'
-+        sys.exit(0)
-+
-+    return [ match.group(2), match.group(1) ]
-+
-+def cmd_help():
-+    print 'Usage: \n\
-+maint-helper.py build-snapshot       - build a source snapshot \n\
-+maint-helper.py fix-copyright [path] - fix the copyright year \n\
-+maint-helper.py check-licenses       - check licenses in the source'
-+
-+def cmd_build_snapshot():
-+    [ name, version ] = get_name_and_version()
-+
-+    print 'Update git...'
-+
-+    retcode = subprocess.call(['git', 'pull'])
-+    if retcode:
-+        print 'ERROR - cannot pull from git'
-+
-+    cmd = 'git-show-ref --hash=10 refs/heads/master'
-+    alphatag = os.popen(cmd).readline().strip()
-+
-+    tarball = '%s-%s-git%s.tar.bz2' % (name, version, alphatag)
-+
-+    print 'Build %s...' % tarball
-+
-+    retcode = subprocess.call(['make', 'distcheck'])
-+    if retcode:
-+        sys.exit(0)
-+
-+    if 'JOYBUILD_PATH' in os.environ:
-+        tarball = os.path.join(os.environ['JOYBUILD_PATH'], 'source', tarball)
-+    os.rename('%s-%s.tar.bz2' % (name, version), tarball)
-+
-+    print 'Update NEWS.sugar...'
-+
-+    if os.environ.has_key('SUGAR_NEWS'):
-+        sugar_news_path = os.environ['SUGAR_NEWS']
-+        if os.path.isfile(sugar_news_path):
-+            f = open(sugar_news_path, 'r')
-+            sugar_news = f.read()
-+            f.close()
-+        else:
-+            sugar_news = ''
-+
-+        [ name, version ] = get_name_and_version()
-+        sugar_news += '%s - %s - %s\n\n' % (name, version, alphatag)
-+
-+        f = open('NEWS', 'r')
-+        for line in f.readlines():
-+            if len(line.strip()) > 0:
-+                sugar_news += line
-+            else:
-+                break
-+        f.close()
-+
-+        f = open(sugar_news_path, 'w')
-+        f.write(sugar_news)
-+        f.close()
-+
-+    print 'Update NEWS...'
-+
-+    f = open('NEWS', 'r')
-+    news = f.read()
-+    f.close()
-+
-+    news = 'Snapshot %s\n\n' % alphatag + news
-+
-+    f = open('NEWS', 'w')
-+    f.write(news)
-+    f.close()
-+
-+    print 'Committing to git...'
-+
-+    changelog = 'Snapshot %s.' % alphatag
-+    retcode = subprocess.call(['git', 'commit', '-a', '-m % s' % changelog])
-+    if retcode:
-+        print 'ERROR - cannot commit to git'
-+
-+    retcode = subprocess.call(['git', 'push'])
-+    if retcode:
-+        print 'ERROR - cannot push to git'
-+
-+    print 'Done.'
-+
-+def check_licenses(path, license, missing):
-+    matchers = { 'LGPL' : 'GNU Lesser General Public',
-+                 'GPL'  : 'GNU General Public License' }
-+
-+    license_file = os.path.join(path, '.license')
-+    if os.path.isfile(license_file):
-+        f = open(license_file, 'r')
-+        license = f.readline().strip()
-+        f.close()
-+
-+    for item in os.listdir(path):
-+        full_path = os.path.join(path, item)
-+
-+        if os.path.isdir(full_path):
-+            check_licenses(full_path, license, missing)
-+        else:
-+            check_source = is_source(item)
-+
-+            # Special cases.
-+            if item.find('marshal') > 0 or \
-+               item.startswith('egg') > 0:
-+                check_source = False
-+
-+            if check_source:
-+                f = open(full_path, 'r')
-+                source = f.read()
-+                f.close()
-+
-+                miss_license = True
-+                if source.find(matchers[license]) > 0:
-+                    miss_license = False
-+
-+                # Special cases.
-+                if source.find('THIS FILE IS GENERATED') > 0:
-+                    miss_license = False
-+
-+                if miss_license:
-+                    if not missing.has_key(license):
-+                        missing[license] = []
-+                    missing[license].append(full_path)
-+
-+def cmd_check_licenses():
-+    missing = {}
-+    check_licenses(os.getcwd(), 'LGPL', missing)
-+
-+    for item in missing.keys():
-+        print '%s:\n' % item
-+        for path in missing[item]:
-+            print path
-+        print '\n'
-+
-+COPYRIGHT = 'Copyright (C) '
-+
-+def fix_copyright(path):
-+    for item in os.listdir(path):
-+        full_path = os.path.join(path, item)
-+
-+        if os.path.isdir(full_path):
-+            fix_copyright(full_path)
-+        elif is_source(item):
-+            f = open(full_path, 'r')
-+            source = f.read()
-+            f.close()
-+
-+            year_start = -1
-+            year_end = -1
-+
-+            i1 = source.find(COPYRIGHT)
-+            if i1 != -1:
-+                i1 += len(COPYRIGHT)
-+                i2 = i1 + source[i1:].find(' ')
-+                if i1 > 0:
-+                    try:
-+                        year_start = int(source[i1:i1 + 4])
-+                        year_end = int(source[i1 + 6: i1 + 10])
-+                    except ValueError:
-+                        pass
-+
-+                if year_start > 0 and year_end < 0:
-+                    year_end = year_start
-+
-+                year = datetime.date.today().year
-+                if year_end < year:
-+                    result = '%s%d-%d%s' % (source[:i1], year_start,
-+                                            year, source[i2:])
-+                    f = open(full_path, 'w')
-+                    f.write(result)
-+                    f.close()
-+
-+def cmd_fix_copyright(path):
-+    fix_copyright(path)
-+
-+if len(sys.argv) < 2:
-+    cmd_help()
-+elif sys.argv[1] == 'build-snapshot':
-+    cmd_build_snapshot()
-+elif sys.argv[1] == 'check-licenses':
-+    cmd_check_licenses()
-+elif sys.argv[1] == 'fix-copyright' and len(sys.argv) > 2:
-+    cmd_fix_copyright(sys.argv[2])
-diff --git a/src/sugar/__init__.py b/src/sugar/__init__.py
-index 91451dd..9be4404 100644
---- a/src/sugar/__init__.py
-+++ b/src/sugar/__init__.py
-@@ -1,5 +1,5 @@
- # Copyright (C) 2006-2007, Red Hat, Inc.
--# Copyright (C) 2007, One Laptop Per Child
-+# Copyright (C) 2007-2008, One Laptop Per Child
- #
- # This library is free software; you can redistribute it and/or
- # modify it under the terms of the GNU Lesser General Public
-@@ -16,3 +16,15 @@
- # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- # Boston, MA 02111-1307, USA.
- 
-+import os
-+import gettext
-+
-+if os.environ.has_key('SUGAR_PREFIX'):
-+    prefix = os.environ['SUGAR_PREFIX']
-+else:
-+    prefix = '/usr'
-+
-+locale_path = os.path.join(prefix, 'share', 'locale')
-+
-+gettext.bindtextdomain('sugar', locale_path)
-+
diff --git a/debian/patches/2991_autoreconf.patch b/debian/patches/2991_autoreconf.patch
deleted file mode 100644
index 06147e5..0000000
--- a/debian/patches/2991_autoreconf.patch
+++ /dev/null
@@ -1,2696 +0,0 @@
-diff --git a/aclocal.m4 b/aclocal.m4
-index 827eb15..71e5d09 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006  Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,14 +11,17 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--m4_if(m4_PACKAGE_VERSION, [2.61],,
--[m4_fatal([this file was generated for autoconf 2.61.
--You have another version of autoconf.  If you want to use that,
--you should regenerate the build system entirely.], [63])])
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.61],,
-+[m4_warning([this file was generated for autoconf 2.61.
-+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'.])])
- 
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
- 
- 
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -106,7 +109,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
--
- AC_LIBTOOL_SYS_MAX_CMD_LEN
- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- AC_LIBTOOL_OBJDIR
-@@ -208,6 +210,8 @@ file_magic*)
-   ;;
- esac
- 
-+_LT_REQUIRED_DARWIN_CHECKS
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- enable_win32_dll=yes, enable_win32_dll=no)
-@@ -287,9 +291,80 @@ ac_outfile=conftest.$ac_objext
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- ])# _LT_LINKER_BOILERPLATE
- 
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+      [lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+   # By default we will add the -single_module flag. You can override
-+   # by either setting the environment variable LT_MULTI_MODULE
-+   # non-empty at configure time, or by adding -multi_module to the
-+   # link flags.
-+   echo "int foo(void){return 1;}" > conftest.c
-+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+     -dynamiclib ${wl}-single_module conftest.c
-+   if test -f libconftest.dylib; then
-+     lt_cv_apple_cc_single_mod=yes
-+     rm -rf libconftest.dylib*
-+   fi
-+   rm conftest.c
-+      fi])
-+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+      [lt_cv_ld_exported_symbols_list],
-+      [lt_cv_ld_exported_symbols_list=no
-+      save_LDFLAGS=$LDFLAGS
-+      echo "_main" > conftest.sym
-+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+   [lt_cv_ld_exported_symbols_list=yes],
-+   [lt_cv_ld_exported_symbols_list=no])
-+   LDFLAGS="$save_LDFLAGS"
-+    ])
-+    case $host_os in
-+    rhapsody* | darwin1.[[0123]])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*)
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+   10.[[012]]*)
-+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+   10.*)
-+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+    fi
-+    if test "$DSYMUTIL" != ":"; then
-+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+])
- 
- # _LT_AC_SYS_LIBPATH_AIX
- # ----------------------
-@@ -570,7 +645,6 @@ s390*-*linux*|sparc*-*linux*)
-       esac
-       ;;
-     *64-bit*)
--      libsuff=64
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -615,7 +689,11 @@ sparc*-*solaris*)
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
-       yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)    LD="${LD-ld} -64" ;;
-+      *)
-+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-       esac
-       ;;
-     esac
-@@ -708,7 +786,7 @@ AC_CACHE_CHECK([$1], [$2],
-        $2=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- ])
- 
-@@ -979,7 +1057,7 @@ else
-     AC_CHECK_FUNC([shl_load],
- 	  [lt_cv_dlopen="shl_load"],
-       [AC_CHECK_LIB([dld], [shl_load],
--	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
- 	[AC_CHECK_FUNC([dlopen],
- 	      [lt_cv_dlopen="dlopen"],
- 	  [AC_CHECK_LIB([dl], [dlopen],
-@@ -987,7 +1065,7 @@ else
- 	    [AC_CHECK_LIB([svld], [dlopen],
- 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- 	      [AC_CHECK_LIB([dld], [dld_link],
--		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
- 	      ])
- 	    ])
- 	  ])
-@@ -1304,7 +1382,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[[4-9]]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -1629,13 +1707,11 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -1647,6 +1723,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -1827,6 +1915,13 @@ esac
- AC_MSG_RESULT([$dynamic_linker])
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
-+[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
-+[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -2326,7 +2421,7 @@ lt_cv_deplibs_check_method='unknown'
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[[4-9]]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -2421,7 +2516,7 @@ linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -2762,7 +2857,7 @@ aix3*)
-   fi
-   ;;
- 
--aix4* | aix5*)
-+aix[[4-9]]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -2819,6 +2914,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
- _LT_AC_TAGVAR(predeps, $1)=
- _LT_AC_TAGVAR(postdeps, $1)=
- _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
- 
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -2928,7 +3024,7 @@ case $host_os in
-     # FIXME: insert proper C++ library support
-     _LT_AC_TAGVAR(ld_shlibs, $1)=no
-     ;;
--  aix4* | aix5*)
-+  aix[[4-9]]*)
-     if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-@@ -2941,7 +3037,7 @@ case $host_os in
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
--      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- 	for ld_flag in $LDFLAGS; do
- 	  case $ld_flag in
- 	  *-brtl*)
-@@ -3087,51 +3183,23 @@ case $host_os in
-     fi
-   ;;
-       darwin* | rhapsody*)
--        case $host_os in
--        rhapsody* | darwin1.[[012]])
--         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[[012]])
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--        esac
-       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-       _LT_AC_TAGVAR(hardcode_direct, $1)=no
-       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
--
--    if test "$GXX" = yes ; then
--      lt_int_apple_cc_single_mod=no
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
-+      if test "$GXX" = yes ; then
-       output_verbose_link_cmd='echo'
--      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
--       lt_int_apple_cc_single_mod=yes
-+      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-       fi
--      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      else
--          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--        fi
--        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          else
--            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          fi
--            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       else
-       case $cc_basename in
-         xlc*)
-@@ -3382,7 +3450,7 @@ case $host_os in
- 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      pgCC*)
-+      pgCC* | pgcpp*)
-         # Portland Group C++ compiler
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -3455,7 +3523,7 @@ case $host_os in
- 	;;
-     esac
-     ;;
--  netbsd*)
-+  netbsd* | netbsdelf*-gnu)
-     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-       wlarc=
-@@ -3817,7 +3885,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
- # compiler output when linking a shared library.
- # Parse the compiler output and extract the necessary
- # objects, libraries and library flags.
--AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
-+[AC_REQUIRE([LT_AC_PROG_SED])dnl
- dnl we can't use the lt_simple_compile_test_code here,
- dnl because it contains code intended for an executable,
- dnl not a library.  It's possible we should let each
-@@ -3942,6 +4011,11 @@ fi
- 
- $rm -f confest.$objext
- 
-+_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
-+if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- ifelse([$1],[CXX],
- [case $host_os in
-@@ -3998,7 +4072,6 @@ solaris*)
-   ;;
- esac
- ])
--
- case " $_LT_AC_TAGVAR(postdeps, $1) " in
- *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
- esac
-@@ -4083,7 +4156,7 @@ aix3*)
-     postinstall_cmds='$RANLIB $lib'
-   fi
-   ;;
--aix4* | aix5*)
-+aix[[4-9]]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -4260,6 +4333,7 @@ if test -f "$ltmain"; then
-     _LT_AC_TAGVAR(predeps, $1) \
-     _LT_AC_TAGVAR(postdeps, $1) \
-     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
-     _LT_AC_TAGVAR(archive_cmds, $1) \
-     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-     _LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4322,7 +4396,7 @@ ifelse([$1], [],
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -4559,6 +4633,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
- # shared library.
- postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -4908,7 +4986,7 @@ EOF
-     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-     cat conftest.$ac_ext >&5
-   fi
--  rm -f conftest* conftst*
-+  rm -rf conftest* conftst*
- 
-   # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
-@@ -4965,7 +5043,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-       # (--disable-auto-import) libraries
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
-     darwin* | rhapsody*)
-       # PIC is the default on this platform
-@@ -5002,7 +5081,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
-     esac
-   else
-     case $host_os in
--      aix4* | aix5*)
-+      aix[[4-9]]*)
- 	# All AIX code is PIC.
- 	if test "$host_cpu" = ia64; then
- 	  # AIX 5 now supports IA64 processor
-@@ -5098,7 +5177,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 	    ;;
--	  pgCC*)
-+	  pgCC* | pgcpp*)
- 	    # Portland Group C++ compiler.
- 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5136,7 +5215,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
-@@ -5249,7 +5328,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-       # (--disable-auto-import) libraries
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -5319,7 +5399,8 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])
-     mingw* | cygwin* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
--      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      m4_if([$1], [GCJ], [],
-+	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
-       ;;
- 
-     hpux9* | hpux10* | hpux11*)
-@@ -5456,7 +5537,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
- #
- if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
--    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
-     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-      "" | " "*) ;;
-@@ -5480,7 +5561,7 @@ esac
- #
- wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
--  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
-   $lt_tmp_static_flag,
-   [],
-   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5496,7 +5577,7 @@ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
- ifelse([$1],[CXX],[
-   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
--  aix4* | aix5*)
-+  aix[[4-9]]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5511,10 +5592,14 @@ ifelse([$1],[CXX],[
-   cygwin* | mingw*)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   esac
-+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
- ],[
-   runpath_var=
-   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -5545,12 +5630,14 @@ ifelse([$1],[CXX],[
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
--  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
-   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-   # platforms (ab)use it in PIC code, but their linkers get confused if
-   # the symbol is explicitly referenced.  Since portable code cannot
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-+dnl Note also adjust exclude_expsyms for C++ above.
-   extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   _LT_CC_BASENAME([$compiler])
-@@ -5600,7 +5687,7 @@ ifelse([$1],[CXX],[
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[[3-9]]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -5716,12 +5803,13 @@ EOF
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -5819,7 +5907,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    aix[[4-9]]*)
-       if test "$host_cpu" = ia64; then
- 	# On IA64, the linker does run time linking by default, so we don't
- 	# have to do anything special.
-@@ -5839,7 +5927,7 @@ _LT_EOF
- 	# Test if we are trying to use run time linking or normal
- 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
--	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
- 	  for ld_flag in $LDFLAGS; do
-   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-   	    aix_use_runtimelinking=yes
-@@ -5999,11 +6087,10 @@ _LT_EOF
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-     if test "$GCC" = yes ; then
-     	output_verbose_link_cmd='echo'
--        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-     else
-       case $cc_basename in
-         xlc*)
-@@ -6153,7 +6240,7 @@ _LT_EOF
-       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -6742,7 +6829,7 @@ else
- fi[]dnl
- ])# PKG_CHECK_MODULES
- 
--# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -6757,7 +6844,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.10'
- 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.10], [],
-+m4_if([$1], [1.10.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -6773,8 +6860,10 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10])dnl
--_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
- 
- # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
-@@ -7046,7 +7135,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-   # each Makefile.in and add a new line on top of each file to say so.
-   # Grep'ing the whole file is not good either: AIX grep has a line
-   # limit of 2048, but all sed's we know have understand at least 4000.
--  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-     dirpart=`AS_DIRNAME("$mf")`
-   else
-     continue
-@@ -7094,13 +7183,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
- # Do all the work for Automake.                             -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006 Free Software Foundation, Inc.
-+# 2005, 2006, 2008 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
- 
--# serial 12
-+# serial 13
- 
- # This macro actually does too much.  Some checks are only needed if
- # your package does certain things.  But this isn't really a big deal.
-@@ -7205,16 +7294,17 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
-+_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
-   case $_am_header in
--    $1 | $1:* )
-+    $_am_arg | $_am_arg:* )
-       break ;;
-     * )
-       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-   esac
- done
--echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
- 
- # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
- #
-@@ -7650,7 +7740,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
- 
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
--# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
- 
-diff --git a/configure b/configure
-index b92f43e..0af631e 100755
---- a/configure
-+++ b/configure
-@@ -857,6 +857,8 @@ LN_S
- ECHO
- AR
- RANLIB
-+DSYMUTIL
-+NMEDIT
- CPP
- CXX
- CXXFLAGS
-@@ -4121,7 +4123,7 @@ lt_cv_deplibs_check_method='unknown'
- # whether `pass_all' will *always* work, you probably want this one.
- 
- case $host_os in
--aix4* | aix5*)
-+aix[4-9]*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -4216,7 +4218,7 @@ linux* | k*bsd*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -4337,7 +4339,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 4340 "configure"' > conftest.$ac_ext
-+  echo '#line 4342 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -4402,7 +4404,6 @@ s390*-*linux*|sparc*-*linux*)
-       esac
-       ;;
-     *64-bit*)
--      libsuff=64
-       case $host in
-         x86_64-*kfreebsd*-gnu)
-           LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -4510,7 +4511,11 @@ sparc*-*solaris*)
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
-       yes*) LD="${LD-ld} -m elf64_sparc" ;;
--      *)    LD="${LD-ld} -64" ;;
-+      *)
-+        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-+	  LD="${LD-ld} -64"
-+	fi
-+	;;
-       esac
-       ;;
-     esac
-@@ -6107,7 +6112,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
- # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
--
- # find the maximum length of command line arguments
- { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
- echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -6422,7 +6426,7 @@ EOF
-     echo "$progname: failed program was:" >&5
-     cat conftest.$ac_ext >&5
-   fi
--  rm -f conftest* conftst*
-+  rm -rf conftest* conftst*
- 
-   # Do not use the global_symbol_pipe unless it works.
-   if test "$pipe_works" = yes; then
-@@ -6982,6 +6986,318 @@ fi
-   ;;
- esac
- 
-+
-+  case $host_os in
-+    rhapsody* | darwin*)
-+    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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$DSYMUTIL"; then
-+  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_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"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+DSYMUTIL=$ac_cv_prog_DSYMUTIL
-+if test -n "$DSYMUTIL"; then
-+  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+echo "${ECHO_T}$DSYMUTIL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_DSYMUTIL"; then
-+  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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_DSYMUTIL"; then
-+  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_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"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-+if test -n "$ac_ct_DSYMUTIL"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_DSYMUTIL" = x; then
-+    DSYMUTIL=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    DSYMUTIL=$ac_ct_DSYMUTIL
-+  fi
-+else
-+  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-+fi
-+
-+    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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NMEDIT"; then
-+  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_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"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+NMEDIT=$ac_cv_prog_NMEDIT
-+if test -n "$NMEDIT"; then
-+  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+echo "${ECHO_T}$NMEDIT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_prog_NMEDIT"; then
-+  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
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$ac_ct_NMEDIT"; then
-+  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_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"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-+if test -n "$ac_ct_NMEDIT"; then
-+  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  if test "x$ac_ct_NMEDIT" = x; then
-+    NMEDIT=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet.  If you think this
-+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+    NMEDIT=$ac_ct_NMEDIT
-+  fi
-+else
-+  NMEDIT="$ac_cv_prog_NMEDIT"
-+fi
-+
-+
-+    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_apple_cc_single_mod=no
-+      if test -z "${LT_MULTI_MODULE}"; then
-+   # By default we will add the -single_module flag. You can override
-+   # by either setting the environment variable LT_MULTI_MODULE
-+   # non-empty at configure time, or by adding -multi_module to the
-+   # link flags.
-+   echo "int foo(void){return 1;}" > conftest.c
-+   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+     -dynamiclib ${wl}-single_module conftest.c
-+   if test -f libconftest.dylib; then
-+     lt_cv_apple_cc_single_mod=yes
-+     rm -rf libconftest.dylib*
-+   fi
-+   rm conftest.c
-+      fi
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
-+    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&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
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  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 "echo \"\$as_me:$LINENO: $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
-+  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 &&
-+       $as_test_x conftest$ac_exeext; then
-+  lt_cv_ld_exported_symbols_list=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	lt_cv_ld_exported_symbols_list=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+   LDFLAGS="$save_LDFLAGS"
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
-+    case $host_os in
-+    rhapsody* | darwin1.[0123])
-+      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+    darwin1.*)
-+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+    darwin*)
-+      # if running on 10.5 or later, the deployment target defaults
-+      # to the OS version, if on x86, and 10.4, the deployment
-+      # target defaults to 10.4. Don't you love it?
-+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
-+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+   10.[012]*)
-+     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+   10.*)
-+     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+      esac
-+    ;;
-+  esac
-+    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
-+      _lt_dar_single_mod='$single_module'
-+    fi
-+    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
-+      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
-+    else
-+      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
-+    fi
-+    if test "$DSYMUTIL" != ":"; then
-+      _lt_dsymutil="~$DSYMUTIL \$lib || :"
-+    else
-+      _lt_dsymutil=
-+    fi
-+    ;;
-+  esac
-+
-+
- enable_dlopen=no
- enable_win32_dll=no
- 
-@@ -7047,7 +7363,7 @@ ac_outfile=conftest.$ac_objext
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- 
- 
- 
-@@ -7075,11 +7391,11 @@ else
-    -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:7078: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7394: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7082: \$? = $ac_status" >&5
-+   echo "$as_me:7398: \$? = $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.
-@@ -7349,10 +7665,10 @@ if test -n "$lt_prog_compiler_pic"; then
- 
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_pic_works=no
-+  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -7365,27 +7681,27 @@ else
-    -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:7368: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7684: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7372: \$? = $ac_status" >&5
-+   echo "$as_me:7688: \$? = $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.
-      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works=yes
-+       lt_cv_prog_compiler_pic_works=yes
-      fi
-    fi
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
- 
--if test x"$lt_prog_compiler_pic_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-     case $lt_prog_compiler_pic in
-      "" | " "*) ;;
-      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7412,10 +7728,10 @@ esac
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_static_works=no
-+  lt_cv_prog_compiler_static_works=no
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-    echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -7428,20 +7744,20 @@ else
-        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works=yes
-+         lt_cv_prog_compiler_static_works=yes
-        fi
-      else
--       lt_prog_compiler_static_works=yes
-+       lt_cv_prog_compiler_static_works=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
- 
--if test x"$lt_prog_compiler_static_works" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-     :
- else
-     lt_prog_compiler_static=
-@@ -7469,11 +7785,11 @@ else
-    -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:7472: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7788: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7476: \$? = $ac_status" >&5
-+   echo "$as_me:7792: \$? = $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
-@@ -7553,12 +7869,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
--  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-+  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-   # platforms (ab)use it in PIC code, but their linkers get confused if
-   # the symbol is explicitly referenced.  Since portable code cannot
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-   extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-@@ -7617,7 +7934,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[3-9]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	ld_shlibs=no
-@@ -7733,12 +8050,13 @@ EOF
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	link_all_deplibs=no
-       else
- 	ld_shlibs=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -7836,7 +8154,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    aix[4-9]*)
-       if test "$host_cpu" = ia64; then
- 	# On IA64, the linker does run time linking by default, so we don't
- 	# have to do anything special.
-@@ -7856,7 +8174,7 @@ _LT_EOF
- 	# Test if we are trying to use run time linking or normal
- 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
--	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	  for ld_flag in $LDFLAGS; do
-   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-   	    aix_use_runtimelinking=yes
-@@ -8128,11 +8446,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       link_all_deplibs=yes
-     if test "$GCC" = yes ; then
-     	output_verbose_link_cmd='echo'
--        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-     else
-       case $cc_basename in
-         xlc*)
-@@ -8282,7 +8599,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -8652,7 +8969,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -8977,13 +9294,11 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -8995,6 +9310,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -9176,6 +9503,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -9495,7 +9837,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
- if test $ac_cv_lib_dld_shl_load = yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
-   { echo "$as_me:$LINENO: checking for dlopen" >&5
- echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -9771,7 +10113,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
- echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
- if test $ac_cv_lib_dld_dld_link = yes; then
--  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
- 
-@@ -9820,7 +10162,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9823 "configure"
-+#line 10165 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -9920,7 +10262,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 9923 "configure"
-+#line 10265 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10047,7 +10389,7 @@ aix3*)
-   fi
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -10103,6 +10445,7 @@ if test -f "$ltmain"; then
-     predeps \
-     postdeps \
-     compiler_lib_search_path \
-+    compiler_lib_search_dirs \
-     archive_cmds \
-     archive_expsym_cmds \
-     postinstall_cmds \
-@@ -10163,7 +10506,7 @@ echo "$as_me: creating $ofile" >&6;}
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
- #
- # This file is part of GNU Libtool:
-@@ -10399,6 +10742,10 @@ predeps=$lt_predeps
- # shared library.
- postdeps=$lt_postdeps
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -10647,6 +10994,7 @@ postdep_objects_CXX=
- predeps_CXX=
- postdeps_CXX=
- compiler_lib_search_path_CXX=
-+compiler_lib_search_dirs_CXX=
- 
- # Source file extension for C++ test sources.
- ac_ext=cpp
-@@ -10684,7 +11032,7 @@ ac_outfile=conftest.$ac_objext
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- 
- 
- # Allow CC to be a program name with arguments.
-@@ -10891,7 +11239,7 @@ case $host_os in
-     # FIXME: insert proper C++ library support
-     ld_shlibs_CXX=no
-     ;;
--  aix4* | aix5*)
-+  aix[4-9]*)
-     if test "$host_cpu" = ia64; then
-       # On IA64, the linker does run time linking by default, so we don't
-       # have to do anything special.
-@@ -10904,7 +11252,7 @@ case $host_os in
-       # Test if we are trying to use run time linking or normal
-       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-       # need to do runtime linking.
--      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	for ld_flag in $LDFLAGS; do
- 	  case $ld_flag in
- 	  *-brtl*)
-@@ -11162,51 +11510,23 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-     fi
-   ;;
-       darwin* | rhapsody*)
--        case $host_os in
--        rhapsody* | darwin1.[012])
--         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
--         ;;
--       *) # Darwin 1.3 on
--         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
--           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--         else
--           case ${MACOSX_DEPLOYMENT_TARGET} in
--             10.[012])
--               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
--               ;;
--             10.*)
--               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
--               ;;
--           esac
--         fi
--         ;;
--        esac
-       archive_cmds_need_lc_CXX=no
-       hardcode_direct_CXX=no
-       hardcode_automatic_CXX=yes
-       hardcode_shlibpath_var_CXX=unsupported
-       whole_archive_flag_spec_CXX=''
-       link_all_deplibs_CXX=yes
--
--    if test "$GXX" = yes ; then
--      lt_int_apple_cc_single_mod=no
-+      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
-+      if test "$GXX" = yes ; then
-       output_verbose_link_cmd='echo'
--      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
--       lt_int_apple_cc_single_mod=yes
-+      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-+      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-+        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
-+        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
-       fi
--      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      else
--          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--        fi
--        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          else
--            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--          fi
--            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-       else
-       case $cc_basename in
-         xlc*)
-@@ -11457,7 +11777,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
- 	;;
--      pgCC*)
-+      pgCC* | pgcpp*)
-         # Portland Group C++ compiler
- 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -11530,7 +11850,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	;;
-     esac
-     ;;
--  netbsd*)
-+  netbsd* | netbsdelf*-gnu)
-     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-       wlarc=
-@@ -11864,7 +12184,6 @@ test "$ld_shlibs_CXX" = no && can_build_shared=no
- GCC_CXX="$GXX"
- LD_CXX="$LD"
- 
--
- cat > conftest.$ac_ext <<EOF
- class Foo
- {
-@@ -11966,6 +12285,11 @@ fi
- 
- $rm -f confest.$objext
- 
-+compiler_lib_search_dirs_CXX=
-+if test -n "$compiler_lib_search_path_CXX"; then
-+  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-+fi
-+
- # PORTME: override above test on systems where it is broken
- case $host_os in
- interix[3-9]*)
-@@ -12021,7 +12345,6 @@ solaris*)
-   ;;
- esac
- 
--
- case " $postdeps_CXX " in
- *" -lc "*) archive_cmds_need_lc_CXX=no ;;
- esac
-@@ -12097,7 +12420,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-     esac
-   else
-     case $host_os in
--      aix4* | aix5*)
-+      aix[4-9]*)
- 	# All AIX code is PIC.
- 	if test "$host_cpu" = ia64; then
- 	  # AIX 5 now supports IA64 processor
-@@ -12193,7 +12516,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	    lt_prog_compiler_pic_CXX='-KPIC'
- 	    lt_prog_compiler_static_CXX='-static'
- 	    ;;
--	  pgCC*)
-+	  pgCC* | pgcpp*)
- 	    # Portland Group C++ compiler.
- 	    lt_prog_compiler_wl_CXX='-Wl,'
- 	    lt_prog_compiler_pic_CXX='-fpic'
-@@ -12231,7 +12554,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       osf3* | osf4* | osf5*)
- 	case $cc_basename in
-@@ -12324,10 +12647,10 @@ if test -n "$lt_prog_compiler_pic_CXX"; then
- 
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_pic_works_CXX=no
-+  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -12340,27 +12663,27 @@ else
-    -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:12343: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12666: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12347: \$? = $ac_status" >&5
-+   echo "$as_me:12670: \$? = $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.
-      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works_CXX=yes
-+       lt_cv_prog_compiler_pic_works_CXX=yes
-      fi
-    fi
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
- 
--if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-     case $lt_prog_compiler_pic_CXX in
-      "" | " "*) ;;
-      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -12387,10 +12710,10 @@ esac
- wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_static_works_CXX=no
-+  lt_cv_prog_compiler_static_works_CXX=no
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-    echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -12403,20 +12726,20 @@ else
-        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works_CXX=yes
-+         lt_cv_prog_compiler_static_works_CXX=yes
-        fi
-      else
--       lt_prog_compiler_static_works_CXX=yes
-+       lt_cv_prog_compiler_static_works_CXX=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
- 
--if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-     :
- else
-     lt_prog_compiler_static_CXX=
-@@ -12444,11 +12767,11 @@ else
-    -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:12447: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12770: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12451: \$? = $ac_status" >&5
-+   echo "$as_me:12774: \$? = $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
-@@ -12501,7 +12824,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
- 
-   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
--  aix4* | aix5*)
-+  aix[4-9]*)
-     # If we're using GNU nm, then we don't want the "-C" option.
-     # -C means demangle to AIX nm, but means don't demangle with GNU nm
-     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -12516,10 +12839,14 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
-   cygwin* | mingw*)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs_CXX=no
-+  ;;
-   *)
-     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-   esac
-+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
- 
- { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
- echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -12621,7 +12948,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -12945,13 +13272,11 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12963,6 +13288,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -13144,6 +13481,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -13227,6 +13579,7 @@ if test -f "$ltmain"; then
-     predeps_CXX \
-     postdeps_CXX \
-     compiler_lib_search_path_CXX \
-+    compiler_lib_search_dirs_CXX \
-     archive_cmds_CXX \
-     archive_expsym_cmds_CXX \
-     postinstall_cmds_CXX \
-@@ -13475,6 +13828,10 @@ predeps=$lt_predeps_CXX
- # shared library.
- postdeps=$lt_postdeps_CXX
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -13689,7 +14046,7 @@ ac_outfile=conftest.$ac_objext
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- 
- 
- # Allow CC to be a program name with arguments.
-@@ -13727,7 +14084,7 @@ aix3*)
-     postinstall_cmds='$RANLIB $lib'
-   fi
-   ;;
--aix4* | aix5*)
-+aix[4-9]*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -13992,10 +14349,10 @@ if test -n "$lt_prog_compiler_pic_F77"; then
- 
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_pic_works_F77=no
-+  lt_cv_prog_compiler_pic_works_F77=no
-   ac_outfile=conftest.$ac_objext
-    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -14008,27 +14365,27 @@ else
-    -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:14011: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14368: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14015: \$? = $ac_status" >&5
-+   echo "$as_me:14372: \$? = $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.
-      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works_F77=yes
-+       lt_cv_prog_compiler_pic_works_F77=yes
-      fi
-    fi
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
- 
--if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
-     case $lt_prog_compiler_pic_F77 in
-      "" | " "*) ;;
-      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14055,10 +14412,10 @@ esac
- wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_F77+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_static_works_F77=no
-+  lt_cv_prog_compiler_static_works_F77=no
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-    echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14071,20 +14428,20 @@ else
-        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works_F77=yes
-+         lt_cv_prog_compiler_static_works_F77=yes
-        fi
-      else
--       lt_prog_compiler_static_works_F77=yes
-+       lt_cv_prog_compiler_static_works_F77=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
- 
--if test x"$lt_prog_compiler_static_works_F77" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
-     :
- else
-     lt_prog_compiler_static_F77=
-@@ -14112,11 +14469,11 @@ else
-    -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:14115: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14472: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14119: \$? = $ac_status" >&5
-+   echo "$as_me:14476: \$? = $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
-@@ -14196,12 +14553,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
--  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-+  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-   # platforms (ab)use it in PIC code, but their linkers get confused if
-   # the symbol is explicitly referenced.  Since portable code cannot
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-   extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-@@ -14260,7 +14618,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[3-9]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	ld_shlibs_F77=no
-@@ -14376,12 +14734,13 @@ EOF
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	link_all_deplibs_F77=no
-       else
- 	ld_shlibs_F77=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -14479,7 +14838,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    aix[4-9]*)
-       if test "$host_cpu" = ia64; then
- 	# On IA64, the linker does run time linking by default, so we don't
- 	# have to do anything special.
-@@ -14499,7 +14858,7 @@ _LT_EOF
- 	# Test if we are trying to use run time linking or normal
- 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
--	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	  for ld_flag in $LDFLAGS; do
-   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-   	    aix_use_runtimelinking=yes
-@@ -14751,11 +15110,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       link_all_deplibs_F77=yes
-     if test "$GCC" = yes ; then
-     	output_verbose_link_cmd='echo'
--        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-     else
-       case $cc_basename in
-         xlc*)
-@@ -14905,7 +15263,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       link_all_deplibs_F77=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -15224,7 +15582,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -15548,13 +15906,11 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15566,6 +15922,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -15747,6 +16115,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -15830,6 +16213,7 @@ if test -f "$ltmain"; then
-     predeps_F77 \
-     postdeps_F77 \
-     compiler_lib_search_path_F77 \
-+    compiler_lib_search_dirs_F77 \
-     archive_cmds_F77 \
-     archive_expsym_cmds_F77 \
-     postinstall_cmds_F77 \
-@@ -16078,6 +16462,10 @@ predeps=$lt_predeps_F77
- # shared library.
- postdeps=$lt_postdeps_F77
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -16252,7 +16640,7 @@ ac_outfile=conftest.$ac_objext
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- 
- 
- # Allow CC to be a program name with arguments.
-@@ -16301,11 +16689,11 @@ else
-    -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:16304: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16692: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16308: \$? = $ac_status" >&5
-+   echo "$as_me:16696: \$? = $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.
-@@ -16365,7 +16753,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-       # built for inclusion in a dll (and should export symbols for example).
-       # Although the cygwin gcc ignores -fPIC, still need this for old-style
-       # (--disable-auto-import) libraries
--      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+
-       ;;
- 
-     darwin* | rhapsody*)
-@@ -16435,7 +16823,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-     mingw* | cygwin* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-       # built for inclusion in a dll (and should export symbols for example).
--      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-+
-       ;;
- 
-     hpux9* | hpux10* | hpux11*)
-@@ -16575,10 +16963,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; then
- 
- { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_pic_works_GCJ=no
-+  lt_cv_prog_compiler_pic_works_GCJ=no
-   ac_outfile=conftest.$ac_objext
-    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -16591,27 +16979,27 @@ else
-    -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:16594: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16982: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16598: \$? = $ac_status" >&5
-+   echo "$as_me:16986: \$? = $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.
-      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
--       lt_prog_compiler_pic_works_GCJ=yes
-+       lt_cv_prog_compiler_pic_works_GCJ=yes
-      fi
-    fi
-    $rm conftest*
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
- 
--if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
-     case $lt_prog_compiler_pic_GCJ in
-      "" | " "*) ;;
-      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -16638,10 +17026,10 @@ esac
- wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
- { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
--if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  lt_prog_compiler_static_works_GCJ=no
-+  lt_cv_prog_compiler_static_works_GCJ=no
-    save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-    echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -16654,20 +17042,20 @@ else
-        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-        if diff conftest.exp conftest.er2 >/dev/null; then
--         lt_prog_compiler_static_works_GCJ=yes
-+         lt_cv_prog_compiler_static_works_GCJ=yes
-        fi
-      else
--       lt_prog_compiler_static_works_GCJ=yes
-+       lt_cv_prog_compiler_static_works_GCJ=yes
-      fi
-    fi
--   $rm conftest*
-+   $rm -r conftest*
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
--echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
-+{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
-+echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
- 
--if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
-+if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
-     :
- else
-     lt_prog_compiler_static_GCJ=
-@@ -16695,11 +17083,11 @@ else
-    -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:16698: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17086: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16702: \$? = $ac_status" >&5
-+   echo "$as_me:17090: \$? = $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
-@@ -16779,12 +17167,13 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar
-   # it will be wrapped by ` (' and `)$', so one must not match beginning or
-   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-   # as well as any symbol that contains `d'.
--  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-+  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
-   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-   # platforms (ab)use it in PIC code, but their linkers get confused if
-   # the symbol is explicitly referenced.  Since portable code cannot
-   # rely on this symbol name, it's probably fine to never include it in
-   # preloaded symbol tables.
-+  # Exclude shared library initialization/finalization symbols.
-   extract_expsyms_cmds=
-   # Just being paranoid about ensuring that cc_basename is set.
-   for cc_temp in $compiler""; do
-@@ -16843,7 +17232,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
- 
-     # See if GNU ld supports shared libraries.
-     case $host_os in
--    aix3* | aix4* | aix5*)
-+    aix[3-9]*)
-       # On AIX/PPC, the GNU linker is very broken
-       if test "$host_cpu" != ia64; then
- 	ld_shlibs_GCJ=no
-@@ -16959,12 +17348,13 @@ EOF
-   $echo "local: *; };" >> $output_objdir/$libname.ver~
- 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
-+	link_all_deplibs_GCJ=no
-       else
- 	ld_shlibs_GCJ=no
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -17062,7 +17452,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    aix4* | aix5*)
-+    aix[4-9]*)
-       if test "$host_cpu" = ia64; then
- 	# On IA64, the linker does run time linking by default, so we don't
- 	# have to do anything special.
-@@ -17082,7 +17472,7 @@ _LT_EOF
- 	# Test if we are trying to use run time linking or normal
- 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- 	# need to do runtime linking.
--	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-+	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
- 	  for ld_flag in $LDFLAGS; do
-   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-   	    aix_use_runtimelinking=yes
-@@ -17354,11 +17744,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       link_all_deplibs_GCJ=yes
-     if test "$GCC" = yes ; then
-     	output_verbose_link_cmd='echo'
--        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
--      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-+        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-+        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
-+        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
-     else
-       case $cc_basename in
-         xlc*)
-@@ -17508,7 +17897,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       link_all_deplibs_GCJ=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
- 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -17827,7 +18216,7 @@ aix3*)
-   soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
--aix4* | aix5*)
-+aix[4-9]*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -18151,13 +18540,11 @@ linux* | k*bsd*-gnu)
-   # Some rework will be needed to allow for fast_install
-   # before this can be enabled.
-   hardcode_into_libs=yes
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
- 
-   # Append ld.so.conf contents to the search path
-   if test -f /etc/ld.so.conf; then
-     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
--    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18169,6 +18556,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -18350,6 +18749,21 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
-+fi
-+
-+sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
-+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
-+fi
-+
-+sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
-+
- variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
- if test "$GCC" = yes; then
-   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18433,6 +18847,7 @@ if test -f "$ltmain"; then
-     predeps_GCJ \
-     postdeps_GCJ \
-     compiler_lib_search_path_GCJ \
-+    compiler_lib_search_dirs_GCJ \
-     archive_cmds_GCJ \
-     archive_expsym_cmds_GCJ \
-     postinstall_cmds_GCJ \
-@@ -18681,6 +19096,10 @@ predeps=$lt_predeps_GCJ
- # shared library.
- postdeps=$lt_postdeps_GCJ
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -18854,7 +19273,7 @@ ac_outfile=conftest.$ac_objext
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- 
- 
- # Allow CC to be a program name with arguments.
-@@ -18914,6 +19333,7 @@ if test -f "$ltmain"; then
-     predeps_RC \
-     postdeps_RC \
-     compiler_lib_search_path_RC \
-+    compiler_lib_search_dirs_RC \
-     archive_cmds_RC \
-     archive_expsym_cmds_RC \
-     postinstall_cmds_RC \
-@@ -19162,6 +19582,10 @@ predeps=$lt_predeps_RC
- # shared library.
- postdeps=$lt_postdeps_RC
- 
-+# The directories searched by this compiler when creating a shared
-+# library
-+compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
-+
- # The library search path used internally by the compiler when linking
- # a shared library.
- compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -20568,13 +20992,13 @@ LN_S!$LN_S$ac_delim
- ECHO!$ECHO$ac_delim
- AR!$AR$ac_delim
- RANLIB!$RANLIB$ac_delim
-+DSYMUTIL!$DSYMUTIL$ac_delim
-+NMEDIT!$NMEDIT$ac_delim
- CPP!$CPP$ac_delim
- CXX!$CXX$ac_delim
- CXXFLAGS!$CXXFLAGS$ac_delim
- ac_ct_CXX!$ac_ct_CXX$ac_delim
- CXXDEPMODE!$CXXDEPMODE$ac_delim
--am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
--am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
- _ACEOF
- 
-   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -20616,6 +21040,8 @@ _ACEOF
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   cat >conf$$subs.sed <<_ACEOF
-+am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-+am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
- CXXCPP!$CXXCPP$ac_delim
- F77!$F77$ac_delim
- FFLAGS!$FFLAGS$ac_delim
-@@ -20639,7 +21065,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -20961,7 +21387,7 @@ echo "$as_me: executing $ac_file commands" >&6;}
-   # each Makefile.in and add a new line on top of each file to say so.
-   # Grep'ing the whole file is not good either: AIX grep has a line
-   # limit of 2048, but all sed's we know have understand at least 4000.
--  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
-+  if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-     dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- 	 X"$mf" : 'X\(//\)[^/]' \| \
-diff --git a/ltmain.sh b/ltmain.sh
-index 8e5a930..5def351 100644
---- a/ltmain.sh
-+++ b/ltmain.sh
-@@ -2,7 +2,7 @@
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
--# 2007  Free Software Foundation, Inc.
-+# 2007, 2008  Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -43,8 +43,8 @@ EXIT_FAILURE=1
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.5.24
--TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-+VERSION="1.5.26 Debian 1.5.26-1"
-+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
- 
- # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -113,15 +113,21 @@ esac
- # These must not be set unconditionally because not all systems understand
- # e.g. LANG=C (notably SCO).
- # We save the old values to restore during execute mode.
--for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+lt_env=
-+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
- do
-   eval "if test \"\${$lt_var+set}\" = set; then
- 	  save_$lt_var=\$$lt_var
-+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
- 	  $lt_var=C
- 	  export $lt_var
- 	fi"
- done
- 
-+if test -n "$lt_env"; then
-+  lt_env="env $lt_env"
-+fi
-+
- # Make sure IFS has a sensible default
- lt_nl='
- '
-@@ -485,7 +491,7 @@ do
-     echo "\
- $PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
- 
--Copyright (C) 2007  Free Software Foundation, Inc.
-+Copyright (C) 2008  Free Software Foundation, Inc.
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-     exit $?
-@@ -788,6 +794,7 @@ if test -z "$show_help"; then
-     *.for) xform=for ;;
-     *.java) xform=java ;;
-     *.obj) xform=obj ;;
-+    *.sx) xform=sx ;;
-     esac
- 
-     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -956,7 +963,7 @@ EOF
-       $run $rm "$lobj" "$output_obj"
- 
-       $show "$command"
--      if $run eval "$command"; then :
-+      if $run eval $lt_env "$command"; then :
-       else
- 	test -n "$output_obj" && $run $rm $removelist
- 	exit $EXIT_FAILURE
-@@ -1028,7 +1035,7 @@ EOF
-       command="$command$suppress_output"
-       $run $rm "$obj" "$output_obj"
-       $show "$command"
--      if $run eval "$command"; then :
-+      if $run eval $lt_env "$command"; then :
-       else
- 	$run $rm $removelist
- 	exit $EXIT_FAILURE
-@@ -1161,6 +1168,7 @@ EOF
-     thread_safe=no
-     vinfo=
-     vinfo_number=no
-+    single_module="${wl}-single_module"
- 
-     func_infer_tag $base_compile
- 
-@@ -1646,6 +1654,11 @@ EOF
- 	continue
- 	;;
- 
-+      -multi_module)
-+	single_module="${wl}-multi_module"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -2122,7 +2135,10 @@ EOF
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
- 	esac
-       fi
-       if test "$pass" = dlopen; then
-@@ -2149,7 +2165,12 @@ EOF
- 	    continue
- 	  fi
- 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
--	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+	  if test "$linkmode" = lib; then
-+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-+	  else
-+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-+	  fi
-+	  for searchdir in $searchdirs; do
- 	    for search_ext in .la $std_shrext .so .a; do
- 	      # Search the libtool library
- 	      lib="$searchdir/lib${name}${search_ext}"
-@@ -2945,12 +2966,18 @@ EOF
- 		  # we do not want to link against static libs,
- 		  # but need to link against shared
- 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
- 		  if test -n "$deplibrary_names" ; then
- 		    for tmp in $deplibrary_names ; do
- 		      depdepl=$tmp
- 		    done
--		    if test -f "$path/$depdepl" ; then
-+		    if test -f "$deplibdir/$depdepl" ; then
-+		      depdepl="$deplibdir/$depdepl"
-+	      	    elif test -f "$path/$depdepl" ; then
- 		      depdepl="$path/$depdepl"
-+		    else
-+		      # Can't find it, oh well...
-+		      depdepl=
- 		    fi
- 		    # do not add paths which are already there
- 		    case " $newlib_search_path " in
-@@ -3098,9 +3125,10 @@ EOF
- 
-     case $linkmode in
-     oldlib)
--      if test -n "$deplibs"; then
--	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
--      fi
-+      case " $deplibs" in
-+      *\ -l* | *\ -L*)
-+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
-+      esac
- 
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-@@ -3244,6 +3272,11 @@ EOF
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
-+	  *)
-+	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-+	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+	    exit $EXIT_FAILURE
-+	    ;;
- 	  esac
- 	  ;;
- 	no)
-@@ -4237,9 +4270,10 @@ EOF
-       ;;
- 
-     obj)
--      if test -n "$deplibs"; then
--	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
--      fi
-+      case " $deplibs" in
-+      *\ -l* | *\ -L*)
-+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
-+      esac
- 
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-@@ -6478,7 +6512,7 @@ relink_command=\"$relink_command\""
-       fi
- 
-       # Restore saved environment variables
--      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-       do
- 	eval "if test \"\${save_$lt_var+set}\" = set; then
- 		$lt_var=\$save_$lt_var; export $lt_var
diff --git a/debian/patches/README b/debian/patches/README
deleted file mode 100644
index 80c1584..0000000
--- a/debian/patches/README
+++ /dev/null
@@ -1,3 +0,0 @@
-0xxx: Grabbed from upstream development.
-1xxx: Possibly relevant for upstream adoption.
-2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6f4320c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001_upstream_git_until_56da6b0.patch
-2991_autoreconf.patch
diff --git a/debian/rules b/debian/rules
index e58e9f1..12eb886 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,20 +3,10 @@
 # Copyright © 2007-2008 Jonas Smedegaard <dr@jones.dk>
 
 # NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks
-
-# Regenerate automade files when explicitly requested with
-#   DEB_BUILD_OPTIONS=init,git fakeroot debian/rules autogen
-ifneq (,$(findstring init,$(DEB_BUILD_OPTIONS)))
-DEB_AUTO_UPDATE_ACLOCAL = 1.10
-DEB_AUTO_UPDATE_AUTOCONF = 1.10
-DEB_AUTO_UPDATE_LIBTOOL = pre
-endif
-
 DEB_BUILDDIR = build
 DEB_PYTHON_SYSTEM = pycentral
 include debian/cdbs/1/rules/upstream-tarball.mk
 include debian/cdbs/1/rules/copyright-check.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include debian/cdbs/1/class/python-autotools.mk
 include debian/cdbs/1/rules/buildinfo.mk
@@ -25,7 +15,11 @@ pkg = python-sugar
 
 DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAGE)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
-DEB_UPSTREAM_TARBALL_MD5 = d5cad965ab884373ab19649175c7fd3d
+DEB_UPSTREAM_TARBALL_MD5 = 27c66181487658f19f35666002076e2d
+
+# Strip hardcoded rpath
+binary-strip/$(pkg)::
+	find $(DEB_DESTDIR)/usr/lib -type f -name '*.so' -exec chrpath -d '{}' ';'
 
 # Cleanup a few empty subdirs missed by py-compile.mk cleanup routines
 clean::
@@ -34,22 +28,12 @@ clean::
 	done
 	-[ ! -d $(DEB_BUILDDIR) ] || rmdir $(DEB_BUILDDIR)
 
-# Regenerate automade files when explicitly requested with
-#   DEB_BUILD_OPTIONS=init,git fakeroot debian/rules autogen
-# From a Git clone extend to DEB_BUILD_OPTIONS=init,git to save as a patch
-ifneq (,$(findstring init,$(DEB_BUILD_OPTIONS)))
-DEB_PHONY_RULES += autogen
-autogen: debian/stamp-autotools-files clean
-ifneq (,$(findstring init,$(DEB_BUILD_OPTIONS)))
-	git-ls-files -m -z -x debian/\* -x config.guess -x config.sub \
-		| xargs -0 git diff -- \
-		> debian/patches/2991_autoreconf.patch
-endif
-endif
-
 # Needed by upstream build process
 #  pygtk << 2.9 contained gobject
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-gtk2-dev, python-gobject-dev (>= 2) | python-gtk2-dev (<< 2.9)
 
+# Needed for our packaging
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), chrpath
+
 # Merge duplicate build-dependencies
 CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')