moz-bonobo-list
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[moz-bonobo-list] r15931 - in /packages/unstable/mozilla-bonobo/debian:


From: joss
Subject: [moz-bonobo-list] r15931 - in /packages/unstable/mozilla-bonobo/debian: ./ patches/
Date: Mon, 12 May 2008 20:23:59 -0000

Author: joss
Date: Mon May 12 20:23:59 2008
New Revision: 15931

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15931
Log:
* Switch to quilt for patch handling; build-depend on quilt.
* 10_check-for-iceape-pkgconfig-files-in-configure.patch: renamed from 
  the xulrunner patch. Now look for the iceape pkgconfig files.
* 70_mandatory-relibtoolize.patch: updated.
* Build-depend on iceape-dev (>= 1.1.9-5). Closes: #480806.

Added:
    
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-iceape-pkgconfig-files-in-configure.patch
      - copied, changed from r15928, 
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-xulrunner-pkgconfig-files-in-configure.patch
    packages/unstable/mozilla-bonobo/debian/patches/series
Removed:
    
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-xulrunner-pkgconfig-files-in-configure.patch
Modified:
    packages/unstable/mozilla-bonobo/debian/changelog
    packages/unstable/mozilla-bonobo/debian/control
    packages/unstable/mozilla-bonobo/debian/control.in
    
packages/unstable/mozilla-bonobo/debian/patches/70_mandatory-relibtoolize.patch
    packages/unstable/mozilla-bonobo/debian/rules

Modified: packages/unstable/mozilla-bonobo/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/changelog?rev=15931&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/changelog (original)
+++ packages/unstable/mozilla-bonobo/debian/changelog Mon May 12 20:23:59 2008
@@ -1,8 +1,16 @@
-mozilla-bonobo (0.4.2.1-7) UNRELEASED; urgency=low
+mozilla-bonobo (0.4.2.1-7) unstable; urgency=low
 
+  [ Loic Minier ]
   * Set maintainer to Debian GNOME Maintainers.
 
- -- Loic Minier <address@hidden>  Sun, 22 Jul 2007 13:36:13 +0200
+  [ Josselin Mouette ]
+  * Switch to quilt for patch handling; build-depend on quilt.
+  * 10_check-for-iceape-pkgconfig-files-in-configure.patch: renamed from 
+    the xulrunner patch. Now look for the iceape pkgconfig files.
+  * 70_mandatory-relibtoolize.patch: updated.
+  * Build-depend on iceape-dev (>= 1.1.9-5). Closes: #480806.
+
+ -- Josselin Mouette <address@hidden>  Mon, 12 May 2008 22:11:24 +0200
 
 mozilla-bonobo (0.4.2.1-6) unstable; urgency=low
 

Modified: packages/unstable/mozilla-bonobo/debian/control
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/control?rev=15931&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/control (original)
+++ packages/unstable/mozilla-bonobo/debian/control Mon May 12 20:23:59 2008
@@ -4,14 +4,15 @@
 Maintainer: Debian GNOME Maintainers <address@hidden>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
+               quilt,
                debhelper (>= 5),
                dh-buildinfo,
                gnome-pkg-tools,
                libgnomeui-dev,
                libgnomeprint2.2-dev,
-               libxul-dev,
+               iceape-dev (>= 1.1.9-5),
                libnspr4-dev
-Uploaders: Andrew Lau <address@hidden>, Loic Minier <address@hidden>
+Uploaders: Andrew Lau <address@hidden>, Josselin Mouette <address@hidden>, 
Loic Minier <address@hidden>
 Standards-Version: 3.7.2
 
 Package: mozilla-bonobo

Modified: packages/unstable/mozilla-bonobo/debian/control.in
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/control.in?rev=15931&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/control.in (original)
+++ packages/unstable/mozilla-bonobo/debian/control.in Mon May 12 20:23:59 2008
@@ -4,12 +4,13 @@
 Maintainer: Debian GNOME Maintainers <address@hidden>
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),
+               quilt,
                debhelper (>= 5),
                dh-buildinfo,
                gnome-pkg-tools,
                libgnomeui-dev,
                libgnomeprint2.2-dev,
-               libxul-dev,
+               iceape-dev (>= 1.1.9-5),
                libnspr4-dev
 Uploaders: @GNOME_TEAM@
 Standards-Version: 3.7.2

Copied: 
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-iceape-pkgconfig-files-in-configure.patch
 (from r15928, 
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-xulrunner-pkgconfig-files-in-configure.patch)
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/patches/10_check-for-iceape-pkgconfig-files-in-configure.patch?rev=15931&op=diff
==============================================================================
--- 
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-xulrunner-pkgconfig-files-in-configure.patch
 (original)
+++ 
packages/unstable/mozilla-bonobo/debian/patches/10_check-for-iceape-pkgconfig-files-in-configure.patch
 Mon May 12 20:23:59 2008
@@ -1,21 +1,22 @@
-diff -urN mozilla-bonobo-0.4.2.1.orig/configure.in 
mozilla-bonobo-0.4.2.1/configure.in
---- mozilla-bonobo-0.4.2.1.orig/configure.in   2005-07-09 19:24:48.000000000 
+0200
-+++ mozilla-bonobo-0.4.2.1/configure.in        2006-07-29 19:15:18.000000000 
+0200
-@@ -26,7 +26,7 @@
+Index: mozilla-bonobo-0.4.2.1/configure.in
+===================================================================
+--- mozilla-bonobo-0.4.2.1.orig/configure.in   2008-05-12 22:05:30.556931746 
+0200
++++ mozilla-bonobo-0.4.2.1/configure.in        2008-05-12 22:09:11.132428480 
+0200
+@@ -26,7 +26,7 @@ dnl Checks for programs.
  if test $moz_include_forced != yes; then
  
        echo -n "Checking if mozilla is in pkg-config..."
 -      if pkg-config --exists mozilla-plugin mozilla-nspr; then
-+      if pkg-config --exists xulrunner-plugin xulrunner-nspr; then
++      if pkg-config --exists iceape-plugin nspr; then
                echo yes;
                mozilla_in_pkgconfig=yes;
        else
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ if test $moz_include_forced != yes; then
        if test $mozilla_in_pkgconfig != yes; then
                PLUGIN_CFLAGS=$(mozilla-config --cflags java plugin)
        else
 -              PLUGIN_CFLAGS=$(pkg-config --cflags mozilla-plugin mozilla-nspr)
-+              PLUGIN_CFLAGS=$(pkg-config --cflags xulrunner-plugin 
xulrunner-nspr)
++              PLUGIN_CFLAGS=$(pkg-config --cflags iceape-plugin nspr)
        fi
  else
        PLUGIN_CFLAGS="-I$MOZILLA_INCLUDE_DIR/java 
-I$MOZILLA_INCLUDE_DIR/plugin -I$MOZILLA_INCLUDE_DIR/nspr"

Modified: 
packages/unstable/mozilla-bonobo/debian/patches/70_mandatory-relibtoolize.patch
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/patches/70_mandatory-relibtoolize.patch?rev=15931&op=diff
==============================================================================
--- 
packages/unstable/mozilla-bonobo/debian/patches/70_mandatory-relibtoolize.patch 
(original)
+++ 
packages/unstable/mozilla-bonobo/debian/patches/70_mandatory-relibtoolize.patch 
Mon May 12 20:23:59 2008
@@ -1,7 +1,8 @@
-diff -Nur mozilla-bonobo-0.4.2.1/aclocal.m4 
mozilla-bonobo-0.4.2.1.new/aclocal.m4
---- mozilla-bonobo-0.4.2.1/aclocal.m4  2005-07-09 19:25:22.000000000 +0200
-+++ mozilla-bonobo-0.4.2.1.new/aclocal.m4      2007-05-16 15:45:31.000000000 
+0200
-@@ -861,31 +861,45 @@
+Index: mozilla-bonobo-0.4.2.1/aclocal.m4
+===================================================================
+--- mozilla-bonobo-0.4.2.1.orig/aclocal.m4     2005-07-09 19:25:22.000000000 
+0200
++++ mozilla-bonobo-0.4.2.1/aclocal.m4  2008-05-12 22:09:16.672931097 +0200
+@@ -861,31 +861,45 @@ AC_PREREQ([2.52])
  # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
  AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
  
@@ -70,7 +71,7 @@
  
  # Copyright 1996, 1997, 1999, 2000, 2001, 2002  Free Software Foundation, Inc.
  
-@@ -996,121 +1010,97 @@
+@@ -996,121 +1010,97 @@ AU_DEFUN([fp_PROG_CC_STDC], [AM_PROG_CC_
  
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
@@ -258,7 +259,7 @@
  AC_LIBTOOL_OBJDIR
  
  AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-@@ -1130,7 +1120,7 @@
+@@ -1130,7 +1120,7 @@ esac
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -267,7 +268,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -1140,9 +1130,6 @@
+@@ -1140,9 +1130,6 @@ Xsed='sed -e s/^X//'
  # double_quote_subst'ed string.
  delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
  
@@ -277,7 +278,7 @@
  # Sed substitution to avoid accidental globbing in evaled expressions
  no_glob_subst='s/\*/\\\*/g'
  
-@@ -1151,28 +1138,60 @@
+@@ -1151,28 +1138,60 @@ rm="rm -f"
  
  # Global variables:
  default_ofile=libtool
@@ -343,7 +344,7 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-@@ -1181,449 +1200,85 @@
+@@ -1181,449 +1200,85 @@ file_magic*)
    ;;
  esac
  
@@ -852,7 +853,7 @@
  
  
  # _LT_AC_SYS_LIBPATH_AIX
-@@ -1634,7 +1289,7 @@
+@@ -1634,7 +1289,7 @@ compiler=$CC
  # the location of the communication and MPI libs are included too.
  # If we don't find anything, use the default library path according
  # to the aix ld manual.
@@ -861,7 +862,7 @@
  [AC_LINK_IFELSE(AC_LANG_PROGRAM,[
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import 
File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -1647,7 +1302,7 @@
+@@ -1647,7 +1302,7 @@ if test -z "$aix_libpath"; then aix_libp
  
  # _LT_AC_SHELL_INIT(ARG)
  # ----------------------
@@ -870,7 +871,7 @@
  [ifdef([AC_DIVERSION_NOTICE],
             [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
         [AC_DIVERT_PUSH(NOTICE)])
-@@ -1660,7 +1315,7 @@
+@@ -1660,7 +1315,7 @@ AC_DIVERT_POP
  # --------------------------
  # Add some code to the start of the generated configure script which
  # will find an echo command which doesn't interpret backslashes.
@@ -879,7 +880,7 @@
  [_LT_AC_SHELL_INIT([
  # Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -1690,23 +1345,23 @@
+@@ -1690,23 +1345,23 @@ fi
  if test "X[$]1" = X--fallback-echo; then
    # used as fallback echo
    shift
@@ -908,7 +909,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -1809,18 +1464,13 @@
+@@ -1809,18 +1464,13 @@ if test "X$ECHO" = "X$CONFIG_SHELL [$]0 
  fi
  
  AC_SUBST(ECHO)
@@ -929,7 +930,7 @@
      [AC_HELP_STRING([--disable-libtool-lock],
        [avoid locking (might break parallel builds)])])
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-@@ -1880,7 +1530,7 @@
+@@ -1880,7 +1530,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -938,7 +939,7 @@
      *32-bit*)
        case $host in
          x86_64-*linux*)
-@@ -1931,51 +1581,34 @@
+@@ -1931,51 +1581,34 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
@@ -1014,7 +1015,7 @@
  
  
  # AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-@@ -1983,11 +1616,10 @@
+@@ -1983,11 +1616,10 @@ _LT_TAGDECL([], [old_archive_cmds], [2],
  # ----------------------------------------------------------------
  # Check whether the given compiler option works
  AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
@@ -1028,7 +1029,7 @@
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
     lt_compiler_flag="$3"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -1996,7 +1628,7 @@
+@@ -1996,7 +1628,7 @@ AC_CACHE_CHECK([$1], [$2],
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -1037,7 +1038,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -2006,8 +1638,10 @@
+@@ -2006,8 +1638,10 @@ AC_CACHE_CHECK([$1], [$2],
     echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
@@ -1050,7 +1051,7 @@
         $2=yes
       fi
     fi
-@@ -2015,9 +1649,9 @@
+@@ -2015,9 +1649,9 @@ AC_CACHE_CHECK([$1], [$2],
  ])
  
  if test x"[$]$2" = xyes; then
@@ -1062,7 +1063,7 @@
  fi
  ])# AC_LIBTOOL_COMPILER_OPTION
  
-@@ -2026,18 +1660,23 @@
+@@ -2026,18 +1660,23 @@ fi
  #                          [ACTION-SUCCESS], [ACTION-FAILURE])
  # ------------------------------------------------------------
  # Check whether the given compiler option works
@@ -1088,7 +1089,7 @@
       else
         $2=yes
       fi
-@@ -2047,9 +1686,9 @@
+@@ -2047,9 +1686,9 @@ m4_define([AC_LIBTOOL_LINKER_OPTION],
  ])
  
  if test x"[$]$2" = xyes; then
@@ -1100,7 +1101,7 @@
  fi
  ])# AC_LIBTOOL_LINKER_OPTION
  
-@@ -2057,8 +1696,7 @@
+@@ -2057,8 +1696,7 @@ fi
  # AC_LIBTOOL_SYS_MAX_CMD_LEN
  # --------------------------
  AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
@@ -1110,7 +1111,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
-@@ -2097,24 +1735,63 @@
+@@ -2097,24 +1735,63 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -1184,7 +1185,7 @@
      teststring=
      # Add a significant safety factor because C++ compilers can tack on 
massive
      # amounts of additional arguments before passing them to the linker.
-@@ -2128,21 +1805,19 @@
+@@ -2128,21 +1805,19 @@ if test -n $lt_cv_sys_max_cmd_len ; then
  else
    AC_MSG_RESULT(none)
  fi
@@ -1209,7 +1210,7 @@
  AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "$cross_compiling" = yes; then :
-@@ -2150,7 +1825,7 @@
+@@ -2150,7 +1825,7 @@ if test "$cross_compiling" = yes; then :
  else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
@@ -1218,7 +1219,7 @@
  [#line __oline__ "configure"
  #include "confdefs.h"
  
-@@ -2208,17 +1883,19 @@
+@@ -2208,17 +1883,19 @@ int main ()
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -1241,7 +1242,7 @@
      esac
    else :
      # compilation failed
-@@ -2230,7 +1907,7 @@
+@@ -2230,7 +1907,7 @@ rm -fr conftest*
  
  
  # AC_LIBTOOL_DLOPEN_SELF
@@ -1250,7 +1251,7 @@
  AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
  [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
  if test "x$enable_dlopen" != xyes; then
-@@ -2301,7 +1978,7 @@
+@@ -2301,7 +1978,7 @@ else
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS 
-DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -1259,7 +1260,7 @@
  
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -2314,7 +1991,7 @@
+@@ -2314,7 +1991,7 @@ else
      ])
  
      if test "x$lt_cv_dlopen_self" = xyes; then
@@ -1268,7 +1269,7 @@
        AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
          lt_cv_dlopen_self_static, [dnl
          _LT_AC_TRY_DLOPEN_SELF(
-@@ -2339,12 +2016,6 @@
+@@ -2339,12 +2016,6 @@ else
    *) enable_dlopen_self_static=unknown ;;
    esac
  fi
@@ -1281,7 +1282,7 @@
  ])# AC_LIBTOOL_DLOPEN_SELF
  
  
-@@ -2353,7 +2024,6 @@
+@@ -2353,7 +2024,6 @@ _LT_DECL([dlopen_self_static], [enable_d
  # Check to see if options -c and -o are simultaneously supported by compiler
  AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
  [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
@@ -1289,7 +1290,7 @@
  AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
    [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
    [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -2369,7 +2039,7 @@
+@@ -2369,7 +2039,7 @@ AC_CACHE_CHECK([if $compiler supports -c
     # Note that $ac_compile itself does not contain backslashes and begins
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -1298,7 +1299,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -2381,11 +2051,13 @@
+@@ -2381,11 +2051,13 @@ AC_CACHE_CHECK([if $compiler supports -c
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -1314,7 +1315,7 @@
     $rm conftest*
     # SGI C++ compiler will create directory out/ii_files/ for
     # template instantiation
-@@ -2395,8 +2067,6 @@
+@@ -2395,8 +2067,6 @@ AC_CACHE_CHECK([if $compiler supports -c
     rmdir conftest
     $rm conftest*
  ])
@@ -1323,7 +1324,7 @@
  ])# AC_LIBTOOL_PROG_CC_C_O
  
  
-@@ -2404,8 +2074,7 @@
+@@ -2404,8 +2074,7 @@ _LT_DECL([compiler_c_o], [lt_cv_prog_com
  # -----------------------------------------
  # Check to see if we can do hard links to lock some files if needed
  AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
@@ -1333,7 +1334,7 @@
  
  hard_links="nottested"
  if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test 
"$need_locks" != no; then
-@@ -2425,7 +2094,6 @@
+@@ -2425,7 +2094,6 @@ if test "$_LT_AC_TAGVAR(lt_cv_prog_compi
  else
    need_locks=no
  fi
@@ -1341,7 +1342,7 @@
  ])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
  
  
-@@ -2443,8 +2111,6 @@
+@@ -2443,8 +2111,6 @@ else
  fi
  rmdir .libs 2>/dev/null])
  objdir=$lt_cv_objdir
@@ -1350,7 +1351,7 @@
  ])# AC_LIBTOOL_OBJDIR
  
  
-@@ -2454,9 +2120,9 @@
+@@ -2454,9 +2120,9 @@ _LT_DECL([], [objdir], [0],
  AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
  [AC_MSG_CHECKING([how to hardcode library paths into programs])
  _LT_AC_TAGVAR(hardcode_action, $1)=
@@ -1363,7 +1364,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -2478,8 +2144,7 @@
+@@ -2478,8 +2144,7 @@ else
  fi
  AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
  
@@ -1373,7 +1374,7 @@
    # Fast installation is not supported
    enable_fast_install=no
  elif test "$shlibpath_overrides_runpath" = yes ||
-@@ -2487,19 +2152,16 @@
+@@ -2487,19 +2152,16 @@ elif test "$shlibpath_overrides_runpath"
    # Fast installation is not necessary
    enable_fast_install=needless
  fi
@@ -1395,7 +1396,7 @@
    test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
    test -z "$striplib" && striplib="$STRIP --strip-unneeded"
    AC_MSG_RESULT([yes])
-@@ -2519,8 +2181,6 @@
+@@ -2519,8 +2181,6 @@ fi
      ;;
    esac
  fi
@@ -1404,7 +1405,7 @@
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
  
-@@ -2528,8 +2188,7 @@
+@@ -2528,8 +2188,7 @@ _LT_DECL([], [striplib], [1])
  # -----------------------------
  # PORTME Fill in your ld.so characteristics
  AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -1414,7 +1415,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -2544,8 +2203,8 @@
+@@ -2544,8 +2203,8 @@ version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
  if test "$GCC" = yes; then
@@ -1425,7 +1426,7 @@
      # if the path contains ";" then we assume it to be the separator
      # otherwise default to the standard path separator (i.e. ":") - it is
      # assumed that no part of a normal pathname contains ";" but that should
-@@ -2593,7 +2252,7 @@
+@@ -2593,7 +2252,7 @@ aix4* | aix5*)
        aix4 | aix4.[[01]] | aix4.[[01]].*)
        if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
           echo ' yes '
@@ -1434,7 +1435,7 @@
        :
        else
        can_build_shared=no
-@@ -2619,13 +2278,9 @@
+@@ -2619,13 +2278,9 @@ aix4* | aix5*)
    ;;
  
  amigaos*)
@@ -1451,7 +1452,7 @@
    ;;
  
  beos*)
-@@ -2634,7 +2289,7 @@
+@@ -2634,7 +2289,7 @@ beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -1460,7 +1461,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -2662,7 +2317,8 @@
+@@ -2662,7 +2317,8 @@ cygwin* | mingw* | pw32*)
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo 
\$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -1470,7 +1471,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -2677,8 +2333,8 @@
+@@ -2677,8 +2333,8 @@ cygwin* | mingw* | pw32*)
      mingw*)
        # MinGW DLLs use traditional 'lib' prefix
        soname_spec='${libname}`echo ${release} | $SED -e 
's/[[.]]/-/g'`${versuffix}${shared_ext}'
@@ -1481,7 +1482,7 @@
          # It is most probably a Windows format PATH printed by
          # mingw gcc, but we are running on Cygwin. Gcc prints its search
          # path with ; separators, and with drive letters. We can handle the
-@@ -2692,7 +2348,7 @@
+@@ -2692,7 +2348,7 @@ cygwin* | mingw* | pw32*)
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -1490,7 +1491,7 @@
        ;;
      esac
      ;;
-@@ -2715,10 +2371,10 @@
+@@ -2715,10 +2371,10 @@ darwin* | rhapsody*)
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -1503,7 +1504,7 @@
    else
      sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
    fi
-@@ -2738,20 +2394,17 @@
+@@ -2738,20 +2394,17 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -1535,7 +1536,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -2769,14 +2422,19 @@
+@@ -2769,14 +2422,19 @@ freebsd*)
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -1557,7 +1558,7 @@
    esac
    ;;
  
-@@ -2796,7 +2454,7 @@
+@@ -2796,7 +2454,7 @@ hpux9* | hpux10* | hpux11*)
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -1566,7 +1567,7 @@
    ia64*)
      shrext_cmds='.so'
      hardcode_into_libs=yes
-@@ -2836,6 +2494,18 @@
+@@ -2836,6 +2494,18 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -1585,7 +1586,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -2879,7 +2549,7 @@
+@@ -2879,7 +2549,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
  # This must be Linux ELF.
@@ -1594,7 +1595,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -2895,7 +2565,7 @@
+@@ -2895,7 +2565,7 @@ linux*)
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -1603,7 +1604,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -2908,7 +2578,7 @@
+@@ -2908,7 +2578,7 @@ linux*)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -1612,7 +1613,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -2917,14 +2587,14 @@
+@@ -2917,14 +2587,14 @@ knetbsd*-gnu)
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -1629,7 +1630,7 @@
      library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${shared_ext}$versuffix'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
-@@ -2957,12 +2627,17 @@
+@@ -2957,12 +2627,17 @@ nto-qnx*)
  
  openbsd*)
    version_type=sunos
@@ -1649,7 +1650,7 @@
      case $host_os in
        openbsd2.[[89]] | openbsd2.[[89]].*)
        shlibpath_overrides_runpath=no
-@@ -2996,13 +2671,6 @@
+@@ -2996,13 +2671,6 @@ osf3* | osf4* | osf5*)
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -1663,7 +1664,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -3028,7 +2696,7 @@
+@@ -3028,7 +2696,7 @@ sunos4*)
    need_version=yes
    ;;
  
@@ -1672,7 +1673,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -3037,6 +2705,7 @@
+@@ -3037,6 +2705,7 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
      sni)
        shlibpath_overrides_runpath=no
        need_lib_prefix=no
@@ -1680,7 +1681,7 @@
        runpath_var=LD_RUN_PATH
        ;;
      siemens)
-@@ -3060,6 +2729,29 @@
+@@ -3060,6 +2729,29 @@ sysv4*MP*)
    fi
    ;;
  
@@ -1710,7 +1711,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -3073,43 +2765,281 @@
+@@ -3073,43 +2765,281 @@ uts4*)
  esac
  AC_MSG_RESULT([$dynamic_linker])
  test "$dynamic_linker" = no && can_build_shared=no
@@ -2022,7 +2023,7 @@
  AC_MSG_CHECKING([for $1])
  AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
  [case $MAGIC_CMD in
-@@ -3122,7 +3052,7 @@
+@@ -3122,7 +3052,7 @@ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
  dnl $ac_dummy forces splitting on constant user-supplied paths.
  dnl POSIX.2 word splitting is done only on the output of word expansions,
  dnl not every word.  This closes a longstanding sh security hole.
@@ -2031,7 +2032,7 @@
    for ac_dir in $ac_dummy; do
      IFS="$lt_save_ifs"
      test -z "$ac_dir" && ac_dir=.
-@@ -3131,13 +3061,13 @@
+@@ -3131,13 +3061,13 @@ dnl not every word.  This closes a longs
        if test -n "$file_magic_test_file"; then
        case $deplibs_check_method in
        "file_magic "*)
@@ -2047,7 +2048,7 @@
  
  *** Warning: the command libtool uses to detect shared libraries,
  *** $file_magic_cmd, produces output that libtool cannot recognize.
-@@ -3148,7 +3078,7 @@
+@@ -3148,7 +3078,7 @@ dnl not every word.  This closes a longs
  *** may want to report the problem to your system manager and/or to
  *** address@hidden
  
@@ -2056,7 +2057,7 @@
          fi ;;
        esac
        fi
-@@ -3165,8 +3095,6 @@
+@@ -3165,8 +3095,6 @@ if test -n "$MAGIC_CMD"; then
  else
    AC_MSG_RESULT(no)
  fi
@@ -2065,7 +2066,7 @@
  ])# AC_PATH_TOOL_PREFIX
  
  
-@@ -3195,11 +3123,9 @@
+@@ -3195,11 +3123,9 @@ AC_DEFUN([AC_PROG_LD],
      [test "$withval" = no || with_gnu_ld=yes],
      [with_gnu_ld=no])
  AC_REQUIRE([LT_AC_PROG_SED])dnl
@@ -2077,7 +2078,7 @@
  ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
-@@ -3217,7 +3143,7 @@
+@@ -3217,7 +3143,7 @@ if test "$GCC" = yes; then
        re_direlt='/[[^/]][[^/]]*/\.\./'
        # Canonicalize the pathname of ld
        ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
@@ -2086,7 +2087,7 @@
        ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
        done
        test -z "$LD" && LD="$ac_prog"
-@@ -3245,7 +3171,7 @@
+@@ -3245,7 +3171,7 @@ AC_CACHE_VAL(lt_cv_path_LD,
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; 
then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -2095,7 +2096,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -3269,20 +3195,15 @@
+@@ -3269,20 +3195,15 @@ else
  fi
  test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
  AC_PROG_LD_GNU
@@ -2119,7 +2120,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -3312,14 +3233,12 @@
+@@ -3312,14 +3233,12 @@ reload_cmds='$LD$reload_flag -o $output$
  case $host_os in
    darwin*)
      if test "$GCC" = yes; then
@@ -2136,7 +2137,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -3328,8 +3247,7 @@
+@@ -3328,8 +3247,7 @@ _LT_DECL([], [reload_cmds], [2])dnl
  # how to check for library dependencies
  #  -- PORTME fill in with the dynamic library characteristics
  AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -2146,7 +2147,7 @@
  lt_cv_deplibs_check_method,
  [lt_cv_file_magic_cmd='$MAGIC_CMD'
  lt_cv_file_magic_test_file=
-@@ -3354,7 +3272,7 @@
+@@ -3354,7 +3272,7 @@ beos*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -2155,7 +2156,7 @@
    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB 
(shared object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
    lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -3366,9 +3284,9 @@
+@@ -3366,9 +3284,9 @@ cygwin*)
    lt_cv_file_magic_cmd='func_win32_libid'
    ;;
  
@@ -2166,7 +2167,7 @@
    lt_cv_deplibs_check_method='file_magic file format 
pei*-i386(.*architecture: i386)?'
    lt_cv_file_magic_cmd='$OBJDUMP -f'
    ;;
-@@ -3377,13 +3295,13 @@
+@@ -3377,13 +3295,13 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -2183,7 +2184,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -3399,7 +3317,7 @@
+@@ -3399,7 +3317,7 @@ gnu*)
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -2192,7 +2193,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic 
(s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -3415,6 +3333,11 @@
+@@ -3415,6 +3333,11 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -2204,7 +2205,7 @@
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -3426,21 +3349,12 @@
+@@ -3426,21 +3349,12 @@ irix5* | irix6* | nonstopux*)
    ;;
  
  # This must be Linux ELF.
@@ -2229,7 +2230,7 @@
      lt_cv_deplibs_check_method='match_pattern 
/lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
    else
      lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-@@ -3458,12 +3372,10 @@
+@@ -3458,12 +3372,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -2245,7 +2246,7 @@
    fi
    ;;
  
-@@ -3471,15 +3383,11 @@
+@@ -3471,15 +3383,11 @@ osf3* | osf4* | osf5*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -2262,7 +2263,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB 
(shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-@@ -3500,10 +3408,13 @@
+@@ -3500,10 +3408,13 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -2278,7 +2279,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  esac
-@@ -3511,11 +3422,6 @@
+@@ -3511,11 +3422,6 @@ esac
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -2290,7 +2291,7 @@
  ])# AC_DEPLIBS_CHECK_METHOD
  
  
-@@ -3528,47 +3434,48 @@
+@@ -3528,47 +3434,48 @@ AC_DEFUN([AC_PROG_NM],
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -2369,7 +2370,7 @@
  
  # AC_CHECK_LIBM
  # -------------
-@@ -3595,21 +3502,22 @@
+@@ -3595,21 +3502,22 @@ esac
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -2402,7 +2403,7 @@
    # For backwards non-gettext consistent compatibility...
    INCLTDL="$LTDLINCL"
  ])# AC_LIBLTDL_CONVENIENCE
-@@ -3619,16 +3527,17 @@
+@@ -3619,16 +3527,17 @@ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -2428,7 +2429,7 @@
    [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
    [if test x"$enable_ltdl_install" = xno; then
       AC_MSG_WARN([libltdl not installed, but installation disabled])
-@@ -3638,8 +3547,8 @@
+@@ -3638,8 +3547,8 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
    ])
    if test x"$enable_ltdl_install" = x"yes"; then
      ac_configure_args="$ac_configure_args --enable-ltdl-install"
@@ -2439,7 +2440,7 @@
    else
      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
      LIBLTDL="-lltdl"
-@@ -3650,1998 +3559,2917 @@
+@@ -3650,1998 +3559,2917 @@ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
  ])# AC_LIBLTDL_INSTALLABLE
  
  
@@ -7139,7 +7140,7 @@
  
      cygwin* | mingw* | pw32*)
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-@@ -5650,1048 +6478,853 @@
+@@ -5650,1048 +6478,853 @@ if test -n "$compiler"; then
        _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
        _LT_AC_TAGVAR(always_export_symbols, $1)=no
        _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -8950,7 +8951,7 @@
  [AC_MSG_CHECKING([for a sed that does not truncate output])
  AC_CACHE_VAL(lt_cv_path_SED,
  [# Loop through the user's path and test for sed and gsed.
-@@ -6714,7 +7347,7 @@
+@@ -6714,7 +7347,7 @@ lt_ac_count=0
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -8959,7 +8960,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -6739,499 +7372,9 @@
+@@ -6739,499 +7372,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
      fi
    done
  done
@@ -9460,7 +9461,7 @@
  ])
  
  dnl AM_GCONF_SOURCE_2
-@@ -7267,11 +7410,10 @@
+@@ -7267,11 +7410,10 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
  
    AC_ARG_ENABLE(schemas-install,
       [  --disable-schemas-install     Disable the schemas installation],
@@ -9477,9 +9478,10 @@
 +  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != 
no])
  ])
  
-diff -Nur mozilla-bonobo-0.4.2.1/configure mozilla-bonobo-0.4.2.1.new/configure
---- mozilla-bonobo-0.4.2.1/configure   2005-07-09 19:25:36.000000000 +0200
-+++ mozilla-bonobo-0.4.2.1.new/configure       2007-05-16 15:45:37.000000000 
+0200
+Index: mozilla-bonobo-0.4.2.1/configure
+===================================================================
+--- mozilla-bonobo-0.4.2.1.orig/configure      2005-07-09 19:25:36.000000000 
+0200
++++ mozilla-bonobo-0.4.2.1/configure   2008-05-12 22:09:56.644428773 +0200
 @@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -9541,7 +9543,7 @@
  
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
+@@ -29,8 +58,43 @@ else
  fi
  
  
@@ -9586,7 +9588,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +108,19 @@
+@@ -44,18 +108,19 @@ do
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -9609,7 +9611,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +128,388 @@
+@@ -63,157 +128,388 @@ fi
  
  
  # Name of the executable.
@@ -10096,7 +10098,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +518,28 @@
+@@ -222,7 +518,28 @@ else
    as_mkdir_p=false
  fi
  
@@ -10126,7 +10128,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 
'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,15 +548,6 @@
+@@ -231,15 +548,6 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -10142,7 +10144,7 @@
  
  
  # Check that we are running under the correct shell.
-@@ -270,23 +578,23 @@
+@@ -270,23 +578,23 @@ fi
  if test "X$1" = X--fallback-echo; then
    # used as fallback echo
    shift
@@ -10171,7 +10173,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -391,29 +699,30 @@
+@@ -391,29 +699,30 @@ fi
  
  
  
@@ -10209,7 +10211,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -425,42 +734,175 @@
+@@ -425,42 +734,175 @@ ac_unique_file="configure.in"
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -10399,7 +10401,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -487,34 +929,48 @@
+@@ -487,34 +929,48 @@ x_libraries=NONE
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -10455,7 +10457,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -536,33 +992,45 @@
+@@ -536,33 +992,45 @@ do
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -10514,7 +10516,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -589,6 +1057,12 @@
+@@ -589,6 +1057,12 @@ do
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -10527,7 +10529,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -613,13 +1087,16 @@
+@@ -613,13 +1087,16 @@ do
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -10548,7 +10550,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -684,6 +1161,16 @@
+@@ -684,6 +1161,16 @@ do
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -10565,7 +10567,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -736,24 +1223,20 @@
+@@ -736,24 +1223,20 @@ do
    -with-* | --with-*)
      ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
      # Reject names that are not valid shell variable names.
@@ -10596,7 +10598,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -784,8 +1267,7 @@
+@@ -784,8 +1267,7 @@ Try \`$0 --help' for more information." 
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -10606,7 +10608,7 @@
      export $ac_envvar ;;
  
    *)
-@@ -805,27 +1287,19 @@
+@@ -805,27 +1287,19 @@ if test -n "$ac_prev"; then
     { (exit 1); exit 1; }; }
  fi
  
@@ -10644,7 +10646,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -852,74 +1326,76 @@
+@@ -852,74 +1326,76 @@ test -n "$host_alias" && ac_tool_prefix=
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -10774,7 +10776,7 @@
  
  #
  # Report the --help message.
-@@ -948,9 +1424,6 @@
+@@ -948,9 +1424,6 @@ Configuration:
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -10784,7 +10786,7 @@
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
                          [$ac_default_prefix]
-@@ -968,15 +1441,22 @@
+@@ -968,15 +1441,22 @@ Fine tuning of the installation director
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -10810,7 +10812,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1003,12 +1483,12 @@
+@@ -1003,12 +1483,12 @@ if test -n "$ac_init_help"; then
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -10827,7 +10829,7 @@
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
    --disable-libtool-lock  avoid locking (might break parallel builds)
-@@ -1019,9 +1499,10 @@
+@@ -1019,9 +1499,10 @@ Optional Features:
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
@@ -10839,7 +10841,7 @@
    --with-x                use the X Window System
  --with-mozilla-include-dir where to find mozilla include files
  --with-plugin-install-dir directory to install the plugin into
-@@ -1033,126 +1514,101 @@
+@@ -1033,126 +1514,101 @@ Some influential environment variables:
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -11021,7 +11023,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1171,7 +1627,7 @@
+@@ -1171,7 +1627,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo 
unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo 
unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo 
unknown`
@@ -11030,7 +11032,7 @@
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo 
unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo 
unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo 
unknown`
-@@ -1185,6 +1641,7 @@
+@@ -1185,6 +1641,7 @@ do
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -11038,7 +11040,7 @@
  
  } >&5
  
-@@ -1206,7 +1663,6 @@
+@@ -1206,7 +1663,6 @@ _ACEOF
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -11046,7 +11048,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1217,7 +1673,7 @@
+@@ -1217,7 +1673,7 @@ do
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -11055,7 +11057,7 @@
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1239,9 +1695,7 @@
+@@ -1239,9 +1695,7 @@ do
          -* ) ac_must_keep_next=true ;;
        esac
        fi
@@ -11066,7 +11068,7 @@
        ;;
      esac
    done
-@@ -1252,8 +1706,8 @@
+@@ -1252,8 +1706,8 @@ $as_unset ac_configure_args1 || test "${
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -11077,7 +11079,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1266,20 +1720,34 @@
+@@ -1266,20 +1720,34 @@ trap 'exit_status=$?
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -11122,7 +11124,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1290,22 +1758,28 @@
+@@ -1290,22 +1758,28 @@ _ASBOX
      echo
      for ac_var in $ac_subst_vars
      do
@@ -11158,7 +11160,7 @@
        done | sort
        echo
      fi
-@@ -1317,26 +1791,24 @@
+@@ -1317,26 +1791,24 @@ _ASBOX
  ## ----------- ##
  _ASBOX
        echo
@@ -11190,7 +11192,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1367,14 +1839,17 @@
+@@ -1367,14 +1839,17 @@ _ACEOF
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -11215,7 +11217,7 @@
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1390,8 +1865,8 @@
+@@ -1390,8 +1865,8 @@ if test -r "$cache_file"; then
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -11226,7 +11228,7 @@
      esac
    fi
  else
-@@ -1403,12 +1878,11 @@
+@@ -1403,12 +1878,11 @@ fi
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -11242,7 +11244,7 @@
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in 
the previous run" >&5
-@@ -1433,8 +1907,7 @@
+@@ -1433,8 +1907,7 @@ echo "$as_me:   current value: $ac_new_v
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -11252,7 +11254,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1451,12 +1924,6 @@
+@@ -1451,12 +1924,6 @@ echo "$as_me: error: run \`make distclea
     { (exit 1); exit 1; }; }
  fi
  
@@ -11265,7 +11267,7 @@
  
  
  
-@@ -1473,33 +1940,44 @@
+@@ -1473,33 +1940,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
  
@@ -11319,7 +11321,7 @@
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-@@ -1514,8 +1992,8 @@
+@@ -1514,8 +1992,8 @@ ac_configure="$SHELL $ac_aux_dir/configu
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -11330,7 +11332,7 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1537,7 +2015,7 @@
+@@ -1537,7 +2015,7 @@ case $as_dir/ in
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11339,7 +11341,7 @@
          if test $ac_prog = install &&
            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
            # AIX install.  It has an incompatible calling convention.
-@@ -1556,21 +2034,22 @@
+@@ -1556,21 +2034,22 @@ case $as_dir/ in
      ;;
  esac
  done
@@ -11367,7 +11369,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1580,8 +2059,8 @@
+@@ -1580,8 +2059,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -11378,7 +11380,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1623,20 +2102,20 @@
+@@ -1623,20 +2102,20 @@ echo "$as_me: error: newly created file 
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -11404,7 +11406,7 @@
  
  
  # expand $ac_aux_dir to an absolute path
-@@ -1656,8 +2135,8 @@
+@@ -1656,8 +2135,8 @@ for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with 
args.
  set dummy $ac_prog; ac_word=$2
@@ -11415,7 +11417,7 @@
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1670,54 +2149,57 @@
+@@ -1670,54 +2149,57 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11494,7 +11496,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1791,8 +2273,8 @@
+@@ -1791,8 +2273,8 @@ if test "$cross_compiling" != no; then
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a 
program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -11505,7 +11507,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1805,32 +2287,34 @@
+@@ -1805,32 +2287,34 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11547,7 +11549,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1843,27 +2327,41 @@
+@@ -1843,27 +2327,41 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11596,7 +11598,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -1876,12 +2374,37 @@
+@@ -1876,12 +2374,37 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst
  
  
  
@@ -11636,7 +11638,7 @@
  
  
  am_make=${MAKE-make}
-@@ -1891,8 +2414,8 @@
+@@ -1891,8 +2414,8 @@ am__doit:
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -11647,7 +11649,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -1919,15 +2442,15 @@
+@@ -1919,15 +2442,15 @@ if test "$am__include" = "#"; then
  fi
  
  
@@ -11668,7 +11670,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -1952,8 +2475,8 @@
+@@ -1952,8 +2475,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program 
name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -11679,7 +11681,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1966,32 +2489,34 @@
+@@ -1966,32 +2489,34 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11721,7 +11723,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2004,36 +2529,51 @@
+@@ -2004,36 +2529,51 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11783,7 +11785,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2046,74 +2586,34 @@
+@@ -2046,74 +2586,34 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11867,7 +11869,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2127,7 +2627,7 @@
+@@ -2127,7 +2627,7 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11876,7 +11878,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2138,6 +2638,7 @@
+@@ -2138,6 +2638,7 @@ do
    fi
  done
  done
@@ -11884,7 +11886,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2155,22 +2656,23 @@
+@@ -2155,22 +2656,23 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -11915,7 +11917,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2183,36 +2685,38 @@
+@@ -2183,36 +2685,38 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11962,7 +11964,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2225,29 +2729,45 @@
+@@ -2225,29 +2729,45 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12014,7 +12016,7 @@
  fi
  
  fi
-@@ -2260,21 +2780,35 @@
+@@ -2260,21 +2780,35 @@ See \`config.log' for more details." >&2
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -12058,7 +12060,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2299,47 +2833,77 @@
+@@ -2299,47 +2833,77 @@ ac_clean_files="$ac_clean_files a.out a.
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -12158,7 +12160,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2351,19 +2915,21 @@
+@@ -2351,19 +2915,21 @@ See \`config.log' for more details." >&2
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -12187,7 +12189,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2382,22 +2948,27 @@
+@@ -2382,22 +2948,27 @@ See \`config.log' for more details." >&2
      fi
    fi
  fi
@@ -12227,7 +12229,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2408,9 +2979,8 @@
+@@ -2408,9 +2979,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -12238,7 +12240,7 @@
          break;;
      * ) break;;
    esac
-@@ -2424,14 +2994,14 @@
+@@ -2424,14 +2994,14 @@ See \`config.log' for more details." >&2
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -12257,7 +12259,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2451,14 +3021,20 @@
+@@ -2451,14 +3021,20 @@ main ()
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -12282,7 +12284,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2476,12 +3052,12 @@
+@@ -2476,12 +3052,12 @@ fi
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -12299,7 +12301,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2504,49 +3080,49 @@
+@@ -2504,49 +3080,49 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12372,7 +12374,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2562,37 +3138,118 @@
+@@ -2562,37 +3138,118 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12506,7 +12508,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -2608,12 +3265,12 @@
+@@ -2608,12 +3265,12 @@ else
      CFLAGS=
    fi
  fi
@@ -12523,7 +12525,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2647,12 +3304,17 @@
+@@ -2647,12 +3304,17 @@ static char *f (char * (*g) (char **, in
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -12543,7 +12545,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2667,201 +3329,57 @@
+@@ -2667,201 +3329,57 @@ return f (e, argv, 0) != argv[0]  ||  f 
    return 0;
  }
  _ACEOF
@@ -12775,7 +12777,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2870,8 +3388,8 @@
+@@ -2870,8 +3388,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -12786,7 +12788,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2953,8 +3471,8 @@
+@@ -2953,8 +3471,8 @@ else
  fi
  
  fi
@@ -12797,7 +12799,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -2971,14 +3489,12 @@
+@@ -2971,14 +3489,12 @@ fi
  
  
  
@@ -12816,7 +12818,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -2986,60 +3502,75 @@
+@@ -2986,60 +3502,75 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -12922,7 +12924,7 @@
  
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -3049,8 +3580,8 @@
+@@ -3049,8 +3580,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program 
name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -12933,7 +12935,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3063,32 +3594,34 @@
+@@ -3063,32 +3594,34 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12975,7 +12977,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3101,36 +3634,51 @@
+@@ -3101,36 +3634,51 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13037,7 +13039,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3143,74 +3691,34 @@
+@@ -3143,74 +3691,34 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13121,7 +13123,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3224,7 +3732,7 @@
+@@ -3224,7 +3732,7 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13130,7 +13132,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -3235,6 +3743,7 @@
+@@ -3235,6 +3743,7 @@ do
    fi
  done
  done
@@ -13138,7 +13140,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -3252,22 +3761,23 @@
+@@ -3252,22 +3761,23 @@ fi
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -13169,7 +13171,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3280,36 +3790,38 @@
+@@ -3280,36 +3790,38 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13216,7 +13218,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3322,29 +3834,45 @@
+@@ -3322,29 +3834,45 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13268,7 +13270,7 @@
  fi
  
  fi
-@@ -3357,27 +3885,41 @@
+@@ -3357,27 +3885,41 @@ See \`config.log' for more details." >&2
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -13320,7 +13322,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3400,49 +3942,49 @@
+@@ -3400,49 +3942,49 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13393,7 +13395,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3458,37 +4000,118 @@
+@@ -3458,37 +4000,118 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13527,7 +13529,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3504,12 +4127,12 @@
+@@ -3504,12 +4127,12 @@ else
      CFLAGS=
    fi
  fi
@@ -13544,7 +13546,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3543,12 +4166,17 @@
+@@ -3543,12 +4166,17 @@ static char *f (char * (*g) (char **, in
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -13564,7 +13566,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3563,201 +4191,57 @@
+@@ -3563,201 +4191,57 @@ return f (e, argv, 0) != argv[0]  ||  f 
    return 0;
  }
  _ACEOF
@@ -13796,7 +13798,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3766,8 +4250,8 @@
+@@ -3766,8 +4250,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  depcc="$CC"   am_compiler_list=
  
@@ -13807,7 +13809,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3849,8 +4333,8 @@
+@@ -3849,8 +4333,8 @@ else
  fi
  
  fi
@@ -13818,7 +13820,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3869,8 +4353,8 @@
+@@ -3869,8 +4353,8 @@ fi
  
  
  
@@ -13829,7 +13831,7 @@
  if test "${am_cv_prog_cc_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3932,44 +4416,42 @@
+@@ -3932,44 +4416,42 @@ return f (e, argv, 0) != argv[0]  ||  f 
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13892,7 +13894,7 @@
  fi
  case "x$am_cv_prog_cc_stdc" in
    x|xno) ;;
-@@ -3981,8 +4463,8 @@
+@@ -3981,8 +4463,8 @@ ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS 
conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -13903,7 +13905,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -4016,24 +4498,22 @@
+@@ -4016,24 +4498,22 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
                     Syntax error
  _ACEOF
@@ -13939,7 +13941,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -4042,9 +4522,10 @@
+@@ -4042,9 +4522,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
    # Broken: fails on valid input.
  continue
  fi
@@ -13951,7 +13953,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4054,24 +4535,22 @@
+@@ -4054,24 +4535,22 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -13987,7 +13989,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -4082,6 +4561,7 @@
+@@ -4082,6 +4561,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  ac_preproc_ok=:
  break
  fi
@@ -13995,7 +13997,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -4099,8 +4579,8 @@
+@@ -4099,8 +4579,8 @@ fi
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -14006,7 +14008,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -4123,24 +4603,22 @@
+@@ -4123,24 +4603,22 @@ cat >>conftest.$ac_ext <<_ACEOF
  #endif
                     Syntax error
  _ACEOF
@@ -14042,7 +14044,7 @@
    :
  else
    echo "$as_me: failed program was:" >&5
-@@ -4149,9 +4627,10 @@
+@@ -4149,9 +4627,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
    # Broken: fails on valid input.
  continue
  fi
@@ -14054,7 +14056,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4161,24 +4640,22 @@
+@@ -4161,24 +4640,22 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -14090,7 +14092,7 @@
    # Broken: success on invalid input.
  continue
  else
-@@ -4189,6 +4666,7 @@
+@@ -4189,6 +4666,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  ac_preproc_ok=:
  break
  fi
@@ -14098,7 +14100,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -4211,23 +4689,170 @@
+@@ -4211,23 +4689,170 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -14280,7 +14282,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4251,34 +4876,31 @@
+@@ -4251,34 +4876,31 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -14329,7 +14331,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4334,6 +4956,7 @@
+@@ -4334,6 +4956,7 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -14337,7 +14339,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4353,18 +4976,27 @@
+@@ -4353,18 +4976,27 @@ main ()
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
        || toupper (i) != TOUPPER (i))
@@ -14371,7 +14373,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4377,12 +5009,14 @@
+@@ -4377,12 +5009,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -14389,7 +14391,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4391,84 +5025,163 @@
+@@ -4391,84 +5025,163 @@ _ACEOF
  
  fi
  
@@ -14601,7 +14603,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4492,7 +5205,7 @@
+@@ -4492,7 +5205,7 @@ lt_ac_count=0
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -14610,7 +14612,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -4517,53 +5230,26 @@
+@@ -4517,53 +5230,26 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
      fi
    done
  done
@@ -14672,7 +14674,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -4577,7 +5263,7 @@
+@@ -4577,7 +5263,7 @@ echo $ECHO_N "checking for ld used by $C
        re_direlt='/[^/][^/]*/\.\./'
        # Canonicalize the pathname of ld
        ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
@@ -14681,7 +14683,7 @@
        ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
        done
        test -z "$LD" && LD="$ac_prog"
-@@ -4592,11 +5278,11 @@
+@@ -4592,11 +5278,11 @@ echo $ECHO_N "checking for ld used by $C
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -14697,7 +14699,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4609,7 +5295,7 @@
+@@ -4609,7 +5295,7 @@ else
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; 
then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -14706,7 +14708,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -4629,21 +5315,21 @@
+@@ -4629,21 +5315,21 @@ fi
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -14735,7 +14737,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -4653,27 +5339,20 @@
+@@ -4653,27 +5339,20 @@ case `$LD -v 2>&1 </dev/null` in
    ;;
  esac
  fi
@@ -14769,7 +14771,7 @@
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
  "" | " "*) ;;
-@@ -4683,23 +5362,15 @@
+@@ -4683,23 +5362,15 @@ reload_cmds='$LD$reload_flag -o $output$
  case $host_os in
    darwin*)
      if test "$GCC" = yes; then
@@ -14796,7 +14798,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4707,63 +5378,63 @@
+@@ -4707,63 +5378,63 @@ else
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -14901,7 +14903,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4790,7 +5461,7 @@
+@@ -4790,7 +5461,7 @@ beos*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -14910,7 +14912,7 @@
    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared 
object|dynamic lib)'
    lt_cv_file_magic_cmd='/usr/bin/file -L'
    lt_cv_file_magic_test_file=/shlib/libc.so
-@@ -4802,9 +5473,9 @@
+@@ -4802,9 +5473,9 @@ cygwin*)
    lt_cv_file_magic_cmd='func_win32_libid'
    ;;
  
@@ -14921,7 +14923,7 @@
    lt_cv_deplibs_check_method='file_magic file format 
pei*-i386(.*architecture: i386)?'
    lt_cv_file_magic_cmd='$OBJDUMP -f'
    ;;
-@@ -4813,13 +5484,13 @@
+@@ -4813,13 +5484,13 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -14938,7 +14940,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -4835,7 +5506,7 @@
+@@ -4835,7 +5506,7 @@ gnu*)
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -14947,7 +14949,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) 
shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -4851,6 +5522,11 @@
+@@ -4851,6 +5522,11 @@ hpux10.20* | hpux11*)
    esac
    ;;
  
@@ -14959,7 +14961,7 @@
  irix5* | irix6* | nonstopux*)
    case $LD in
    *-32|*"-32 ") libmagic=32-bit;;
-@@ -4862,21 +5538,12 @@
+@@ -4862,21 +5538,12 @@ irix5* | irix6* | nonstopux*)
    ;;
  
  # This must be Linux ELF.
@@ -14984,7 +14986,7 @@
      lt_cv_deplibs_check_method='match_pattern 
/lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-@@ -4894,12 +5561,10 @@
+@@ -4894,12 +5561,10 @@ nto-qnx*)
    ;;
  
  openbsd*)
@@ -15000,7 +15002,7 @@
    fi
    ;;
  
-@@ -4907,15 +5572,11 @@
+@@ -4907,15 +5572,11 @@ osf3* | osf4* | osf5*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -15017,7 +15019,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared 
object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -4936,17 +5597,20 @@
+@@ -4936,17 +5597,20 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -15041,7 +15043,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -4954,99 +5618,226 @@
+@@ -4954,99 +5618,226 @@ test -z "$deplibs_check_method" && depli
  
  
  
@@ -15341,7 +15343,7 @@
  
  
  
-@@ -5055,103 +5846,227 @@
+@@ -5055,103 +5846,227 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
  
  
  
@@ -15641,7 +15643,7 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -5159,37 +6074,43 @@
+@@ -5159,37 +6074,43 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -15702,7 +15704,7 @@
  else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -5197,1173 +6118,10906 @@
+@@ -5197,1173 +6118,10906 @@ do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -27460,7 +27462,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6377,67 +17031,62 @@
+@@ -6377,67 +17031,62 @@ else
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -27550,7 +27552,7 @@
        ;;
  
      beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-@@ -6447,64 +17096,69 @@
+@@ -6447,64 +17096,69 @@ echo $ECHO_N "checking for $compiler opt
      mingw* | 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).
@@ -27633,7 +27635,7 @@
           ;;
         esac
         ;;
-@@ -6512,219 +17166,231 @@
+@@ -6512,219 +17166,231 @@ echo $ECHO_N "checking for $compiler opt
      mingw* | 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).
@@ -27963,7 +27965,7 @@
     $rm -r conftest 2>/dev/null
     mkdir conftest
     cd conftest
-@@ -6737,23 +17403,25 @@
+@@ -6737,23 +17403,25 @@ else
     # Note that $ac_compile itself does not contain backslashes and begins
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -27995,7 +27997,7 @@
     $rm conftest*
     # SGI C++ compiler will create directory out/ii_files/ for
     # template instantiation
-@@ -6764,28 +17432,23 @@
+@@ -6764,28 +17432,23 @@ else
     $rm conftest*
  
  fi
@@ -28031,7 +28033,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so 
\`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be 
unsafe" >&2;}
-@@ -6795,51 +17458,55 @@
+@@ -6795,51 +17458,55 @@ else
    need_locks=no
  fi
  
@@ -28118,7 +28120,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -6850,23 +17517,48 @@
+@@ -6850,23 +17517,48 @@ echo $ECHO_N "checking whether the $comp
        with_gnu_ld=no
      fi
      ;;
@@ -28170,7 +28172,7 @@
  
  *** Warning: the GNU linker, at least up to release 2.9.1, is reported
  *** to be unable to reliably create shared libraries on AIX.
-@@ -6874,16 +17566,14 @@
+@@ -6874,16 +17566,14 @@ echo $ECHO_N "checking whether the $comp
  *** really care for shared libraries, you may want to modify your PATH
  *** so that a non-GNU linker is found, and then restart.
  
@@ -28191,7 +28193,7 @@
  
        # Samuel A. Falvo II <address@hidden> reports
        # that the semantics of dynamic libraries on AmigaOS, at least up
-@@ -6891,59 +17581,106 @@
+@@ -6891,59 +17581,106 @@ _LT_EOF
        # with the same dynamic library.  Since this doesn't match the
        # behavior of shared libraries on other platforms, we can't use
        # them.
@@ -28323,7 +28325,7 @@
  
  *** Warning: The releases 2.8.* of the GNU linker cannot reliably
  *** create shared libraries on Solaris systems.  Therefore, libtool
-@@ -6952,77 +17689,79 @@
+@@ -6952,77 +17689,79 @@ _LT_EOF
  *** your PATH or compiler configuration so that the native linker is
  *** used, and then restart.
  
@@ -28451,7 +28453,7 @@
        fi
        ;;
  
-@@ -7036,10 +17775,10 @@
+@@ -7036,10 +17775,10 @@ _LT_EOF
        else
        # 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
@@ -28465,7 +28467,7 @@
        fi
        aix_use_runtimelinking=no
  
-@@ -7053,6 +17792,7 @@
+@@ -7053,6 +17792,7 @@ _LT_EOF
            break
          fi
          done
@@ -28473,7 +28475,7 @@
        esac
  
        exp_sym_flag='-bexport'
-@@ -7065,33 +17805,37 @@
+@@ -7065,33 +17805,37 @@ _LT_EOF
        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
  
@@ -28523,7 +28525,7 @@
        else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -7099,23 +17843,22 @@
+@@ -7099,23 +17843,22 @@ _LT_EOF
        # chokes on -Wl,-G. The following line is correct:
          shared_flag='-G'
        else
@@ -28552,7 +28554,7 @@
         cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7132,26 +17875,23 @@
+@@ -7132,26 +17875,23 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28591,7 +28593,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import 
File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -7162,21 +17902,22 @@
+@@ -7162,21 +17902,22 @@ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28623,7 +28625,7 @@
         cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7193,26 +17934,23 @@
+@@ -7193,26 +17934,23 @@ main ()
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28662,7 +28664,7 @@
  
  aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import 
File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
  }'`
-@@ -7223,39 +17961,37 @@
+@@ -7223,39 +17961,37 @@ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28718,7 +28720,7 @@
        ;;
  
      cygwin* | mingw* | pw32*)
-@@ -7263,79 +17999,80 @@
+@@ -7263,79 +17999,80 @@ if test -z "$aix_libpath"; then aix_libp
        # Microsoft Visual C++.
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
@@ -28833,7 +28835,7 @@
        ;;
  
      # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-@@ -7343,91 +18080,106 @@
+@@ -7343,91 +18080,106 @@ if test -z "$aix_libpath"; then aix_libp
      # does not break anything, and helps significantly (at the cost of a 
little
      # extra space).
      freebsd2.2*)
@@ -28989,7 +28991,7 @@
          ;;
        esac
        fi
-@@ -7435,267 +18187,246 @@
+@@ -7435,267 +18187,246 @@ if test -z "$aix_libpath"; then aix_libp
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -29400,7 +29402,7 @@
      *'~'*)
        # FIXME: we may have to deal with multi-command sequences.
        ;;
-@@ -7703,8 +18434,8 @@
+@@ -7703,8 +18434,8 @@ x|xyes)
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -29411,7 +29413,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -7717,171 +18448,40 @@
+@@ -7717,171 +18448,40 @@ echo $ECHO_N "checking whether -lc shoul
          lib=conftest
          libobjs=conftest.$ac_objext
          deplibs=
@@ -29596,7 +29598,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -7896,8 +18496,8 @@
+@@ -7896,8 +18496,8 @@ version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
  if test "$GCC" = yes; then
@@ -29607,7 +29609,7 @@
      # if the path contains ";" then we assume it to be the separator
      # otherwise default to the standard path separator (i.e. ":") - it is
      # assumed that no part of a normal pathname contains ";" but that should
-@@ -7945,7 +18545,7 @@
+@@ -7945,7 +18545,7 @@ aix4* | aix5*)
        aix4 | aix4.[01] | aix4.[01].*)
        if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
           echo ' yes '
@@ -29616,7 +29618,7 @@
        :
        else
        can_build_shared=no
-@@ -7971,13 +18571,9 @@
+@@ -7971,13 +18571,9 @@ aix4* | aix5*)
    ;;
  
  amigaos*)
@@ -29633,7 +29635,7 @@
    ;;
  
  beos*)
-@@ -7986,7 +18582,7 @@
+@@ -7986,7 +18582,7 @@ beos*)
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -29642,7 +29644,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -8014,7 +18610,8 @@
+@@ -8014,7 +18610,8 @@ cygwin* | mingw* | pw32*)
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo 
\$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -29652,7 +29654,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -8029,8 +18626,8 @@
+@@ -8029,8 +18626,8 @@ cygwin* | mingw* | pw32*)
      mingw*)
        # MinGW DLLs use traditional 'lib' prefix
        soname_spec='${libname}`echo ${release} | $SED -e 
's/[.]/-/g'`${versuffix}${shared_ext}'
@@ -29663,7 +29665,7 @@
          # It is most probably a Windows format PATH printed by
          # mingw gcc, but we are running on Cygwin. Gcc prints its search
          # path with ; separators, and with drive letters. We can handle the
-@@ -8044,7 +18641,7 @@
+@@ -8044,7 +18641,7 @@ cygwin* | mingw* | pw32*)
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -29672,7 +29674,7 @@
        ;;
      esac
      ;;
-@@ -8067,10 +18664,10 @@
+@@ -8067,10 +18664,10 @@ darwin* | rhapsody*)
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -29685,7 +29687,7 @@
    else
      sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
    fi
-@@ -8090,20 +18687,17 @@
+@@ -8090,20 +18687,17 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -29717,7 +29719,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -8121,14 +18715,19 @@
+@@ -8121,14 +18715,19 @@ freebsd*)
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -29739,7 +29741,7 @@
    esac
    ;;
  
-@@ -8148,7 +18747,7 @@
+@@ -8148,7 +18747,7 @@ hpux9* | hpux10* | hpux11*)
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -29748,7 +29750,7 @@
    ia64*)
      shrext_cmds='.so'
      hardcode_into_libs=yes
-@@ -8188,6 +18787,18 @@
+@@ -8188,6 +18787,18 @@ hpux9* | hpux10* | hpux11*)
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -29767,7 +29769,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -8231,7 +18842,7 @@
+@@ -8231,7 +18842,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
  # This must be Linux ELF.
@@ -29776,7 +29778,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -8247,7 +18858,7 @@
+@@ -8247,7 +18858,7 @@ linux*)
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -29785,7 +29787,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -8260,7 +18871,7 @@
+@@ -8260,7 +18871,7 @@ linux*)
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -29794,7 +29796,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -8269,14 +18880,14 @@
+@@ -8269,14 +18880,14 @@ knetbsd*-gnu)
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -29811,7 +29813,7 @@
      library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${shared_ext}$versuffix'
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
-@@ -8309,12 +18920,17 @@
+@@ -8309,12 +18920,17 @@ nto-qnx*)
  
  openbsd*)
    version_type=sunos
@@ -29831,7 +29833,7 @@
      case $host_os in
        openbsd2.[89] | openbsd2.[89].*)
        shlibpath_overrides_runpath=no
-@@ -8348,13 +18964,6 @@
+@@ -8348,13 +18964,6 @@ osf3* | osf4* | osf5*)
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -29845,7 +29847,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -8380,7 +18989,7 @@
+@@ -8380,7 +18989,7 @@ sunos4*)
    need_version=yes
    ;;
  
@@ -29854,7 +29856,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -8389,6 +18998,7 @@
+@@ -8389,6 +18998,7 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
      sni)
        shlibpath_overrides_runpath=no
        need_lib_prefix=no
@@ -29862,7 +29864,7 @@
        runpath_var=LD_RUN_PATH
        ;;
      siemens)
-@@ -8399,2155 +19009,1540 @@
+@@ -8399,2155 +19009,1540 @@ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
        need_version=no
        shlibpath_overrides_runpath=no
        sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
@@ -33168,7 +33170,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10555,65 +20550,75 @@
+@@ -10555,65 +20550,75 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33275,7 +33277,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -10622,12 +20627,12 @@
+@@ -10622,12 +20627,12 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -33291,7 +33293,7 @@
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
  
-@@ -10637,78 +20642,70 @@
+@@ -10637,78 +20642,70 @@ cat >>conftest.$ac_ext <<_ACEOF
  # include <assert.h>
  #endif
  
@@ -33403,7 +33405,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10716,78 +20713,65 @@
+@@ -10716,78 +20713,65 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33512,7 +33514,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -10795,2235 +20779,2231 @@
+@@ -10795,2235 +20779,2231 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -34905,7 +34907,7 @@
 -# if CDPATH is set.
 -if test "X${CDPATH+set}" = Xset; then CDPATH=${ZSH_VERSION+.}:; export 
CDPATH; fi
 +      echo -n "Checking if mozilla is in pkg-config..."
-+      if pkg-config --exists xulrunner-plugin xulrunner-nspr; then
++      if pkg-config --exists iceape-plugin nspr; then
 +              echo yes;
 +              mozilla_in_pkgconfig=yes;
 +      else
@@ -35169,7 +35171,7 @@
 +      if test $mozilla_in_pkgconfig != yes; then
 +              PLUGIN_CFLAGS=$(mozilla-config --cflags java plugin)
 +      else
-+              PLUGIN_CFLAGS=$(pkg-config --cflags xulrunner-plugin 
xulrunner-nspr)
++              PLUGIN_CFLAGS=$(pkg-config --cflags iceape-plugin nspr)
 +      fi
 +else
 +      PLUGIN_CFLAGS="-I$MOZILLA_INCLUDE_DIR/java 
-I$MOZILLA_INCLUDE_DIR/plugin -I$MOZILLA_INCLUDE_DIR/nspr"
@@ -37701,9 +37703,10 @@
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -Nur mozilla-bonobo-0.4.2.1/ltmain.sh mozilla-bonobo-0.4.2.1.new/ltmain.sh
---- mozilla-bonobo-0.4.2.1/ltmain.sh   2005-07-09 19:30:10.000000000 +0200
-+++ mozilla-bonobo-0.4.2.1.new/ltmain.sh       2006-03-11 19:49:04.000000000 
+0100
+Index: mozilla-bonobo-0.4.2.1/ltmain.sh
+===================================================================
+--- mozilla-bonobo-0.4.2.1.orig/ltmain.sh      2005-07-09 19:30:10.000000000 
+0200
++++ mozilla-bonobo-0.4.2.1/ltmain.sh   2008-05-12 22:09:16.936930530 +0200
 @@ -1,7 +1,7 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -37729,7 +37732,7 @@
  basename="s,^.*/,,g"
  
  # Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-@@ -35,19 +34,23 @@
+@@ -35,19 +34,23 @@ basename="s,^.*/,,g"
  progpath="$0"
  
  # The name of this program:
@@ -37757,7 +37760,7 @@
  
  # Check that we have a working $echo.
  if test "X$1" = X--no-reexec; then
-@@ -80,52 +83,20 @@
+@@ -80,52 +83,20 @@ mkdir="mkdir"
  mv="mv -f"
  rm="rm -f"
  
@@ -37818,7 +37821,7 @@
    ;;
  esac
  
-@@ -142,8 +113,9 @@
+@@ -142,8 +113,9 @@ if test "${LANG+set}" = set; then
  fi
  
  # Make sure IFS has a sensible default
@@ -37830,7 +37833,7 @@
  
  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
    $echo "$modename: not configured to build any kind of library" 1>&2
-@@ -160,6 +132,8 @@
+@@ -160,6 +132,8 @@ run=
  show="$echo"
  show_help=
  execute_dlfiles=
@@ -37839,7 +37842,7 @@
  lo2o="s/\\.lo\$/.${objext}/"
  o2lo="s/\\.${objext}\$/.lo/"
  
-@@ -167,13 +141,51 @@
+@@ -167,13 +141,51 @@ o2lo="s/\\.${objext}\$/.lo/"
  # Shell function definitions:
  # This seems to be the best place for them
  
@@ -37892,7 +37895,7 @@
    win32_libid_type="unknown"
    win32_fileres=`file -L $1 2>/dev/null`
    case $win32_fileres in
-@@ -181,15 +193,14 @@
+@@ -181,15 +193,14 @@ func_win32_libid () {
      win32_libid_type="x86 archive import"
      ;;
    *ar\ archive*) # could be an import, or static
@@ -37916,7 +37919,7 @@
      fi
      ;;
    *DLL*)
-@@ -207,14 +218,14 @@
+@@ -207,14 +218,14 @@ func_win32_libid () {
  }
  
  
@@ -37933,7 +37936,7 @@
      if test -n "$available_tags" && test -z "$tagname"; then
        CC_quoted=
        for arg in $CC; do
-@@ -233,7 +244,7 @@
+@@ -233,7 +244,7 @@ func_infer_tag () {
        # if we don't check for them as well.
        *)
        for z in $available_tags; do
@@ -37942,7 +37945,7 @@
            # Evaluate the configuration.
            eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# 
### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
            CC_quoted=
-@@ -271,37 +282,116 @@
+@@ -271,37 +282,116 @@ func_infer_tag () {
        esac
      fi
  }
@@ -38084,7 +38087,7 @@
  # Parse our command line options once, thoroughly.
  while test "$#" -gt 0
  do
-@@ -337,7 +427,7 @@
+@@ -337,7 +427,7 @@ do
        # not specially marked.
        ;;
        *)
@@ -38093,7 +38096,7 @@
          taglist="$taglist $tagname"
          # Evaluate the configuration.
          eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: 
'$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-@@ -364,12 +454,12 @@
+@@ -364,12 +454,12 @@ do
      ;;
  
    --version)
@@ -38109,7 +38112,7 @@
      ;;
  
    --config)
-@@ -378,7 +468,7 @@
+@@ -378,7 +468,7 @@ do
      for tagname in $taglist; do
        ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END 
LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
      done
@@ -38118,7 +38121,7 @@
      ;;
  
    --debug)
-@@ -403,7 +493,7 @@
+@@ -403,7 +493,7 @@ do
      else
        $echo "disable static libraries"
      fi
@@ -38127,7 +38130,7 @@
      ;;
  
    --finish) mode="finish" ;;
-@@ -418,7 +508,11 @@
+@@ -418,7 +508,11 @@ do
      preserve_args="$preserve_args $arg"
      ;;
  
@@ -38140,7 +38143,7 @@
    --tag=*)
      set tag "$optarg" ${1+"$@"}
      shift
-@@ -450,16 +544,66 @@
+@@ -450,16 +544,66 @@ if test -n "$prevopt"; then
    exit $EXIT_FAILURE
  fi
  
@@ -38212,7 +38215,7 @@
  
    # Only execute mode is allowed to have -dlopen flags.
    if test -n "$execute_dlfiles" && test "$mode" != execute; then
-@@ -488,7 +632,7 @@
+@@ -488,7 +632,7 @@ exec_cmd=
  
      for arg
      do
@@ -38221,7 +38224,7 @@
        arg  )
        # do not "continue".  Instead, add this to base_compile
        lastarg="$arg"
-@@ -513,7 +657,7 @@
+@@ -513,7 +657,7 @@ exec_cmd=
          continue
          ;;
  
@@ -38230,7 +38233,7 @@
          later="$later $arg"
          continue
          ;;
-@@ -532,7 +676,7 @@
+@@ -532,7 +676,7 @@ exec_cmd=
          args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
          lastarg=
          save_ifs="$IFS"; IFS=','
@@ -38239,7 +38242,7 @@
            IFS="$save_ifs"
  
            # Double-quote args containing other shell metacharacters.
-@@ -570,7 +714,10 @@
+@@ -570,7 +714,10 @@ exec_cmd=
        case $lastarg in
        # Double-quote args containing other shell metacharacters.
        # Many Bourne shells cannot handle close brackets correctly
@@ -38251,7 +38254,7 @@
        *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \   ]*|*]*|"")
        lastarg="\"$lastarg\""
        ;;
-@@ -627,18 +774,7 @@
+@@ -627,18 +774,7 @@ exec_cmd=
  
      for arg in $later; do
        case $arg in
@@ -38270,7 +38273,7 @@
        build_old_libs=yes
        continue
        ;;
-@@ -655,6 +791,14 @@
+@@ -655,6 +791,14 @@ exec_cmd=
        esac
      done
  
@@ -38285,7 +38288,7 @@
      objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
      xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
      if test "X$xdir" = "X$obj"; then
-@@ -727,12 +871,17 @@
+@@ -727,12 +871,17 @@ compiler."
        $run $rm $removelist
        exit $EXIT_FAILURE
        fi
@@ -38304,7 +38307,7 @@
  
      $run $rm "$libobj" "${libobj}T"
  
-@@ -740,7 +889,7 @@
+@@ -740,7 +889,7 @@ compiler."
      # but don't create it if we're doing a dry run.
      test -z "$run" && cat > ${libobj}T <<EOF
  # $libobj - a libtool object file
@@ -38313,7 +38316,7 @@
  #
  # Please DO NOT delete this file!
  # It is necessary for linking the library.
-@@ -754,18 +903,18 @@
+@@ -754,18 +903,18 @@ EOF
        fbsd_hideous_sh_bug=$base_compile
  
        if test "$pic_mode" != no; then
@@ -38337,7 +38340,7 @@
        fi
        fi
  
-@@ -837,9 +986,9 @@
+@@ -837,9 +986,9 @@ EOF
      if test "$build_old_libs" = yes; then
        if test "$pic_mode" != yes; then
        # Don't build PIC code
@@ -38349,7 +38352,7 @@
        fi
        if test "$compiler_c_o" = yes; then
        command="$command -o $obj"
-@@ -968,6 +1117,7 @@
+@@ -968,6 +1117,7 @@ EOF
      no_install=no
      objs=
      non_pic_objects=
@@ -38357,7 +38360,7 @@
      precious_files_regex=
      prefer_static_libs=no
      preload=no
-@@ -988,15 +1138,6 @@
+@@ -988,15 +1138,6 @@ EOF
      for arg
      do
        case $arg in
@@ -38373,7 +38376,7 @@
        -all-static | -static)
        if test "X$arg" = "X-all-static"; then
          if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; 
then
-@@ -1004,18 +1145,16 @@
+@@ -1004,18 +1145,16 @@ EOF
          fi
          if test -n "$link_static_flag"; then
            dlopen_self=$dlopen_self_static
@@ -38394,7 +38397,7 @@
        break
        ;;
        esac
-@@ -1126,7 +1265,7 @@
+@@ -1126,7 +1265,7 @@ EOF
              # A libtool-controlled object.
  
              # Check to see that this really is a libtool object.
@@ -38403,7 +38406,7 @@
                pic_object=
                non_pic_object=
  
-@@ -1137,9 +1276,9 @@
+@@ -1137,9 +1276,9 @@ EOF
                *) . ./$arg ;;
                esac
  
@@ -38415,7 +38418,7 @@
                   test "$non_pic_object" = none; then
                  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
                  exit $EXIT_FAILURE
-@@ -1190,6 +1329,11 @@
+@@ -1190,6 +1329,11 @@ EOF
                  if test -z "$pic_object" || test "$pic_object" = none ; then
                    arg="$non_pic_object"
                  fi
@@ -38427,7 +38430,7 @@
                fi
              else
                # Only an error if not doing a dry-run.
-@@ -1268,21 +1412,15 @@
+@@ -1268,21 +1412,15 @@ EOF
          finalize_command="$finalize_command $qarg"
          continue
          ;;
@@ -38455,7 +38458,7 @@
          prev=
          continue
          ;;
-@@ -1298,14 +1436,17 @@
+@@ -1298,14 +1436,17 @@ EOF
  
        case $arg in
        -all-static)
@@ -38476,7 +38479,7 @@
        ;;
  
        -avoid-version)
-@@ -1341,6 +1482,18 @@
+@@ -1341,6 +1482,18 @@ EOF
        continue
        ;;
  
@@ -38495,7 +38498,7 @@
        -inst-prefix-dir)
        prev=inst_prefix
        continue
-@@ -1367,7 +1520,8 @@
+@@ -1367,7 +1520,8 @@ EOF
          absdir=`cd "$dir" && pwd`
          if test -z "$absdir"; then
            $echo "$modename: cannot determine absolute directory name of 
\`$dir'" 1>&2
@@ -38505,7 +38508,7 @@
          fi
          dir="$absdir"
          ;;
-@@ -1381,10 +1535,15 @@
+@@ -1381,10 +1535,15 @@ EOF
        esac
        case $host in
        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -38521,7 +38524,7 @@
          ;;
        esac
        continue
-@@ -1393,26 +1552,35 @@
+@@ -1393,26 +1552,35 @@ EOF
        -l*)
        if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
          case $host in
@@ -38562,7 +38565,7 @@
           # Do not include libc_r directly, use -pthread flag.
           continue
           ;;
-@@ -1422,23 +1590,41 @@
+@@ -1422,23 +1590,41 @@ EOF
        continue
        ;;
  
@@ -38615,7 +38618,7 @@
        # Unknown arguments in both finalize_command and compile_command need
        # to be aesthetically quoted because they are evaled later.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-@@ -1449,9 +1635,7 @@
+@@ -1449,9 +1635,7 @@ EOF
        esac
          compile_command="$compile_command $arg"
          finalize_command="$finalize_command $arg"
@@ -38626,7 +38629,7 @@
          continue
          ;;
  
-@@ -1528,11 +1712,6 @@
+@@ -1528,11 +1712,6 @@ EOF
        continue
        ;;
  
@@ -38638,7 +38641,7 @@
        -static)
        # The effects of -static are defined in a previous loop.
        # We used to do the same as -all-static on platforms that
-@@ -1609,11 +1788,6 @@
+@@ -1609,11 +1788,6 @@ EOF
        continue
        ;;
  
@@ -38650,7 +38653,7 @@
        # Some other compiler flag.
        -* | +*)
        # Unknown arguments in both finalize_command and compile_command need
-@@ -1635,7 +1809,7 @@
+@@ -1635,7 +1809,7 @@ EOF
        # A libtool-controlled object.
  
        # Check to see that this really is a libtool object.
@@ -38659,7 +38662,7 @@
          pic_object=
          non_pic_object=
  
-@@ -1646,9 +1820,9 @@
+@@ -1646,9 +1820,9 @@ EOF
          *) . ./$arg ;;
          esac
  
@@ -38671,7 +38674,7 @@
             test "$non_pic_object" = none; then
            $echo "$modename: cannot find name of object for \`$arg'" 1>&2
            exit $EXIT_FAILURE
-@@ -1699,6 +1873,11 @@
+@@ -1699,6 +1873,11 @@ EOF
            if test -z "$pic_object" || test "$pic_object" = none ; then
              arg="$non_pic_object"
            fi
@@ -38683,7 +38686,7 @@
          fi
        else
          # Only an error if not doing a dry-run.
-@@ -1804,9 +1983,9 @@
+@@ -1804,9 +1983,9 @@ EOF
      if test ! -d "$output_objdir"; then
        $show "$mkdir $output_objdir"
        $run $mkdir $output_objdir
@@ -38696,7 +38699,7 @@
        fi
      fi
  
-@@ -1869,7 +2048,6 @@
+@@ -1869,7 +2048,6 @@ EOF
      newlib_search_path=
      need_relink=no # whether we're linking any uninstalled libtool libraries
      notinst_deplibs= # not-installed libtool libraries
@@ -38704,7 +38707,7 @@
      case $linkmode in
      lib)
        passes="conv link"
-@@ -1904,7 +2082,10 @@
+@@ -1904,7 +2082,10 @@ EOF
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;
@@ -38716,7 +38719,7 @@
        esac
        fi
        if test "$pass" = dlopen; then
-@@ -1921,7 +2102,7 @@
+@@ -1921,7 +2102,7 @@ EOF
            compile_deplibs="$deplib $compile_deplibs"
            finalize_deplibs="$deplib $finalize_deplibs"
          else
@@ -38725,7 +38728,7 @@
          fi
          continue
          ;;
-@@ -1930,10 +2111,6 @@
+@@ -1930,10 +2111,6 @@ EOF
            $echo "$modename: warning: \`-l' is ignored for archives/objects" 
1>&2
            continue
          fi
@@ -38736,7 +38739,7 @@
          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
            for search_ext in .la $std_shrext .so .a; do
-@@ -1966,7 +2143,7 @@
+@@ -1966,7 +2143,7 @@ EOF
              case " $predeps $postdeps " in
              *" $deplib "*)
                if (${SED} -e '2q' $lib |
@@ -38745,7 +38748,7 @@
                  library_names=
                  old_library=
                  case $lib in
-@@ -1997,18 +2174,6 @@
+@@ -1997,18 +2174,6 @@ EOF
            fi
          fi
          ;; # -l
@@ -38764,7 +38767,7 @@
        -L*)
          case $linkmode in
          lib)
-@@ -2056,7 +2221,22 @@
+@@ -2056,7 +2221,22 @@ EOF
          fi
          case $linkmode in
          lib)
@@ -38788,7 +38791,7 @@
              $echo
              $echo "*** Warning: Trying to link with static lib archive 
$deplib."
              $echo "*** I have the capability to make that library 
automatically link in when"
-@@ -2106,12 +2286,12 @@
+@@ -2106,12 +2286,12 @@ EOF
        esac # case $deplib
        if test "$found" = yes || test -f "$lib"; then :
        else
@@ -38803,7 +38806,7 @@
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
          exit $EXIT_FAILURE
-@@ -2130,6 +2310,8 @@
+@@ -2130,6 +2310,8 @@ EOF
        # it will not redefine variables installed, or shouldnotlink
        installed=yes
        shouldnotlink=no
@@ -38812,7 +38815,7 @@
  
        # Read the .la file
        case $lib in
-@@ -2137,13 +2319,6 @@
+@@ -2137,13 +2319,6 @@ EOF
        *) . ./$lib ;;
        esac
  
@@ -38826,7 +38829,7 @@
        if test "$linkmode,$pass" = "lib,link" ||
           test "$linkmode,$pass" = "prog,scan" ||
           { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-@@ -2235,6 +2410,7 @@
+@@ -2235,6 +2410,7 @@ EOF
            dir="$libdir"
            absdir="$libdir"
          fi
@@ -38834,7 +38837,7 @@
        else
          if test ! -f "$ladir/$objdir/$linklib" && test -f 
"$abs_ladir/$linklib"; then
            dir="$ladir"
-@@ -2319,12 +2495,12 @@
+@@ -2319,12 +2495,12 @@ EOF
          if test -n "$library_names" &&
             { test "$prefer_static_libs" = no || test -z "$old_library"; }; 
then
            # We need to hardcode the library path
@@ -38849,7 +38852,7 @@
              esac
            fi
  
-@@ -2361,16 +2537,20 @@
+@@ -2361,16 +2537,20 @@ EOF
        fi
  
        link_static=no # Whether the deplib will be linked statically
@@ -38873,7 +38876,7 @@
          if test "$shouldnotlink" = yes && test "$pass" = link ; then
            $echo
            if test "$linkmode" = prog; then
-@@ -2475,12 +2655,15 @@
+@@ -2475,12 +2655,15 @@ EOF
              if test "$hardcode_direct" = no; then
                add="$dir/$linklib"
                case $host in
@@ -38891,7 +38894,7 @@
                      $echo "** Warning, lib $linklib is a module, not a shared 
library"
                      if test -z "$old_library" ; then
                        $echo
-@@ -2511,7 +2694,7 @@
+@@ -2511,7 +2694,7 @@ EOF
                add_dir="-L$dir"
                # Try looking first in the location we're being installed to.
                if test -n "$inst_prefix_dir"; then
@@ -38900,7 +38903,7 @@
                    [\\/]*)
                      add_dir="$add_dir -L$inst_prefix_dir$libdir"
                      ;;
-@@ -2545,8 +2728,8 @@
+@@ -2545,8 +2728,8 @@ EOF
            else
              test -n "$add_dir" && deplibs="$add_dir $deplibs"
              test -n "$add" && deplibs="$add $deplibs"
@@ -38911,7 +38914,7 @@
                 test "$hardcode_shlibpath_var" = yes; then
                case :$finalize_shlibpath: in
                *":$libdir:"*) ;;
-@@ -2584,7 +2767,7 @@
+@@ -2584,7 +2767,7 @@ EOF
              add_dir="-L$libdir"
              # Try looking first in the location we're being installed to.
              if test -n "$inst_prefix_dir"; then
@@ -38920,7 +38923,7 @@
                  [\\/]*)
                    add_dir="$add_dir -L$inst_prefix_dir$libdir"
                    ;;
-@@ -2645,8 +2828,6 @@
+@@ -2645,8 +2828,6 @@ EOF
              fi
            fi
          else
@@ -38929,7 +38932,7 @@
            deplibs="$dir/$old_library $deplibs"
            link_static=yes
          fi
-@@ -2706,7 +2887,7 @@
+@@ -2706,7 +2887,7 @@ EOF
                  fi
                  ;;
                esac
@@ -38938,7 +38941,7 @@
                  path="$absdir/$objdir"
                else
                  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-@@ -2745,7 +2926,6 @@
+@@ -2745,7 +2926,6 @@ EOF
                  ;;
                esac
                ;;
@@ -38946,7 +38949,7 @@
              -l*)
                case $host in
                *-*-darwin*)
-@@ -2762,24 +2942,15 @@
+@@ -2762,24 +2942,15 @@ EOF
                *) continue ;;
                esac
                ;;
@@ -38975,7 +38978,7 @@
              esac
            done
          fi # link_all_deplibs != no
-@@ -3033,6 +3204,11 @@
+@@ -3033,6 +3204,11 @@ EOF
            age="$number_minor"
            revision="$number_minor"
            ;;
@@ -38987,7 +38990,7 @@
          esac
          ;;
        no)
-@@ -3044,27 +3220,27 @@
+@@ -3044,27 +3220,27 @@ EOF
  
        # Check that each of the things are valid numbers.
        case $current in
@@ -39021,7 +39024,7 @@
          $echo "$modename: \`$vinfo' is not valid version information" 1>&2
          exit $EXIT_FAILURE
          ;;
-@@ -3243,9 +3419,9 @@
+@@ -3243,9 +3419,9 @@ EOF
  
        # Eliminate all temporary directories.
        for path in $notinst_path; do
@@ -39034,7 +39037,7 @@
        done
  
        if test -n "$xrpath"; then
-@@ -3291,14 +3467,19 @@
+@@ -3291,14 +3467,19 @@ EOF
            ;;
          *-*-rhapsody* | *-*-darwin1.[012])
            # Rhapsody C library is in the System framework
@@ -39057,7 +39060,7 @@
            ;;
          *)
            # Add libc to deplibs on all other systems if necessary.
-@@ -3342,11 +3523,11 @@
+@@ -3342,11 +3523,11 @@ EOF
          int main() { return 0; }
  EOF
          $rm conftest
@@ -39071,7 +39074,7 @@
              # If $name is empty we are operating on a -L argument.
                if test "$name" != "" && test "$name" -ne "0"; then
                if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 
then
-@@ -3383,11 +3564,11 @@
+@@ -3383,11 +3564,11 @@ EOF
            # Error occurred in the first compile.  Let's try to salvage
            # the situation: Compile a separate program for each library.
            for i in $deplibs; do
@@ -39085,7 +39088,7 @@
                # Did it work?
                if test "$?" -eq 0 ; then
                  ldd_output=`ldd conftest`
-@@ -3435,7 +3616,7 @@
+@@ -3435,7 +3616,7 @@ EOF
          set dummy $deplibs_check_method
          file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
          for a_deplib in $deplibs; do
@@ -39094,7 +39097,7 @@
            # If $name is empty we are operating on a -L argument.
              if test "$name" != "" && test  "$name" != "0"; then
              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 
then
-@@ -3452,8 +3633,8 @@
+@@ -3452,8 +3633,8 @@ EOF
                  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
                  for potent_lib in $potential_libs; do
                      # Follow soft links.
@@ -39105,7 +39108,7 @@
                        continue
                      fi
                      # The statement above tries to avoid entering an
-@@ -3469,9 +3650,9 @@
+@@ -3469,9 +3650,9 @@ EOF
                        *) potlib=`$echo "X$potlib" | $Xsed -e 
's,[^/]*$,,'`"$potliblink";;
                        esac
                      done
@@ -39118,7 +39121,7 @@
                        newdeplibs="$newdeplibs $a_deplib"
                        a_deplib=""
                        break 2
-@@ -3504,7 +3685,7 @@
+@@ -3504,7 +3685,7 @@ EOF
          set dummy $deplibs_check_method
          match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
          for a_deplib in $deplibs; do
@@ -39127,7 +39130,7 @@
            # If $name is empty we are operating on a -L argument.
            if test -n "$name" && test "$name" != "0"; then
              if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; 
then
-@@ -3521,9 +3702,9 @@
+@@ -3521,9 +3702,9 @@ EOF
                  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
                  for potent_lib in $potential_libs; do
                    potlib="$potent_lib" # see symlink-check above in 
file_magic test
@@ -39140,7 +39143,7 @@
                      newdeplibs="$newdeplibs $a_deplib"
                      a_deplib=""
                      break 2
-@@ -3554,16 +3735,16 @@
+@@ -3554,16 +3735,16 @@ EOF
          ;;
        none | unknown | *)
          newdeplibs=""
@@ -39161,7 +39164,7 @@
            $echo
            if test "X$deplibs_check_method" = "Xnone"; then
              $echo "*** Warning: inter-library dependencies are not supported 
in this platform."
-@@ -3584,7 +3765,7 @@
+@@ -3584,7 +3765,7 @@ EOF
        case $host in
        *-*-rhapsody* | *-*-darwin1.[012])
          # On Rhapsody replace the C library is the System framework
@@ -39170,7 +39173,7 @@
          ;;
        esac
  
-@@ -3630,17 +3811,39 @@
+@@ -3630,17 +3811,39 @@ EOF
            fi
          fi
        fi
@@ -39217,7 +39220,7 @@
        # All the library-specific variables (install_libdir is set above).
        library_names=
        old_library=
-@@ -3724,6 +3927,7 @@
+@@ -3724,6 +3927,7 @@ EOF
        fi
  
        lib="$output_objdir/$realname"
@@ -39225,7 +39228,7 @@
        for link
        do
          linknames="$linknames $link"
-@@ -3752,6 +3956,9 @@
+@@ -3752,6 +3956,9 @@ EOF
                # The command line is too long to execute in one step.
                $show "using reloadable object file for export list..."
                skipped_export=:
@@ -39235,7 +39238,7 @@
              fi
            done
            IFS="$save_ifs"
-@@ -3785,67 +3992,13 @@
+@@ -3785,67 +3992,13 @@ EOF
            eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
          else
            gentop="$output_objdir/${outputname}x"
@@ -39306,7 +39309,7 @@
        if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
          eval flag=\"$thread_safe_flag_spec\"
          linker_flags="$linker_flags $flag"
-@@ -3875,7 +4028,8 @@
+@@ -3875,7 +4028,8 @@ EOF
          fi
        fi
  
@@ -39316,7 +39319,7 @@
           test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
          :
        else
-@@ -3894,7 +4048,7 @@
+@@ -3894,7 +4048,7 @@ EOF
            save_libobjs=$libobjs
          fi
          save_output=$output
@@ -39325,7 +39328,7 @@
  
          # Clear the reloadable object creation command queue and
          # initialize k to one.
-@@ -3910,7 +4064,7 @@
+@@ -3910,7 +4064,7 @@ EOF
          do
            eval test_cmds=\"$reload_cmds $objlist $last_robj\"
            if test "X$objlist" = X ||
@@ -39334,7 +39337,7 @@
                 test "$len" -le "$max_cmd_len"; }; then
              objlist="$objlist $obj"
            else
-@@ -3946,7 +4100,7 @@
+@@ -3946,7 +4100,7 @@ EOF
            eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
            fi
  
@@ -39343,7 +39346,7 @@
          # after they are used.
          i=0
          while test "$i" -lt "$k"
-@@ -3962,16 +4116,7 @@
+@@ -3962,16 +4116,7 @@ EOF
          for cmd in $concat_cmds; do
            IFS="$save_ifs"
            $show "$cmd"
@@ -39361,7 +39364,7 @@
          done
          IFS="$save_ifs"
  
-@@ -4024,7 +4169,7 @@
+@@ -4024,7 +4169,7 @@ EOF
  
        # Restore the uninstalled library and exit
        if test "$mode" = relink; then
@@ -39370,7 +39373,7 @@
  
          if test -n "$convenience"; then
            if test -z "$whole_archive_flag_spec"; then
-@@ -4033,7 +4178,7 @@
+@@ -4033,7 +4178,7 @@ EOF
            fi
          fi
  
@@ -39379,7 +39382,7 @@
        fi
  
        # Create links to the real library.
-@@ -4110,64 +4255,10 @@
+@@ -4110,64 +4255,10 @@ EOF
          eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
        else
          gentop="$output_objdir/${obj}x"
@@ -39446,7 +39449,7 @@
        fi
        fi
  
-@@ -4253,24 +4344,50 @@
+@@ -4253,24 +4344,50 @@ EOF
        case $host in
        *-*-rhapsody* | *-*-darwin1.[012])
        # On Rhapsody replace the C library is the System framework
@@ -39503,7 +39506,7 @@
        compile_command="$compile_command $compile_deplibs"
        finalize_command="$finalize_command $finalize_deplibs"
  
-@@ -4315,10 +4432,15 @@
+@@ -4315,10 +4432,15 @@ EOF
        fi
        case $host in
        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -39519,7 +39522,7 @@
          ;;
        esac
        done
-@@ -4396,7 +4518,7 @@
+@@ -4396,7 +4518,7 @@ EOF
  
          test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
  /* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
@@ -39528,7 +39531,7 @@
  
  #ifdef __cplusplus
  extern \"C\" {
-@@ -4432,13 +4554,25 @@
+@@ -4432,13 +4554,25 @@ extern \"C\" {
  
            # Prepare the list of exported symbols
            if test -z "$export_symbols"; then
@@ -39558,7 +39561,7 @@
            fi
          fi
  
-@@ -4459,7 +4593,7 @@
+@@ -4459,7 +4593,7 @@ extern \"C\" {
            fi
  
            # Try sorting and uniquifying the output.
@@ -39567,7 +39570,7 @@
                if sort -k 3 </dev/null >/dev/null 2>&1; then
                  sort -k 3
                else
-@@ -4468,7 +4602,7 @@
+@@ -4468,7 +4602,7 @@ extern \"C\" {
                uniq > "$nlist"S; then
              :
            else
@@ -39576,7 +39579,7 @@
            fi
  
            if test -f "$nlist"S; then
-@@ -4489,7 +4623,26 @@
+@@ -4489,7 +4623,26 @@ extern \"C\" {
  #endif
  
  /* The mapping between symbol names and symbols. */
@@ -39603,7 +39606,7 @@
    const char *name;
    lt_ptr address;
  }
-@@ -4536,16 +4689,29 @@
+@@ -4536,16 +4689,29 @@ static const void *lt_preloaded_setup() 
          esac
  
          # Now compile the dynamic symbol file.
@@ -39637,7 +39640,7 @@
          ;;
        *)
          $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-@@ -4570,7 +4736,7 @@
+@@ -4570,7 +4736,7 @@ static const void *lt_preloaded_setup() 
        # We have no uninstalled library dependencies, so finalize right now.
        $show "$link_command"
        $run eval "$link_command"
@@ -39646,7 +39649,7 @@
  
        # Delete the generated files.
        if test -n "$dlsyms"; then
-@@ -4578,7 +4744,7 @@
+@@ -4578,7 +4744,7 @@ static const void *lt_preloaded_setup() 
          $run $rm "$output_objdir/${outputname}S.${objext}"
        fi
  
@@ -39655,7 +39658,7 @@
        fi
  
        if test -n "$shlibpath_var"; then
-@@ -4718,15 +4884,17 @@
+@@ -4718,15 +4884,17 @@ static const void *lt_preloaded_setup() 
        esac
        case $host in
          *cygwin* | *mingw* )
@@ -39678,7 +39681,7 @@
  
     The $output program cannot be directly executed until all the libtool
     libraries that it depends on are installed.
-@@ -4746,6 +4914,8 @@
+@@ -4746,6 +4914,8 @@ EOF
  #include <malloc.h>
  #include <stdarg.h>
  #include <assert.h>
@@ -39687,7 +39690,7 @@
  #include <sys/stat.h>
  
  #if defined(PATH_MAX)
-@@ -4790,6 +4960,8 @@
+@@ -4790,6 +4960,8 @@ EOF
    if (stale) { free ((void *) stale); stale = 0; } \
  } while (0)
  
@@ -39696,7 +39699,7 @@
  #if defined DEBUGWRAPPER
  # define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
  #else
-@@ -4800,7 +4972,7 @@
+@@ -4800,7 +4972,7 @@ const char *program_name = NULL;
  
  void * xmalloc (size_t num);
  char * xstrdup (const char *string);
@@ -39705,7 +39708,7 @@
  char * find_executable(const char *wrapper);
  int    check_executable(const char *path);
  char * strendzap(char *str, const char *pat);
-@@ -4812,17 +4984,17 @@
+@@ -4812,17 +4984,17 @@ main (int argc, char *argv[])
    char **newargz;
    int i;
  
@@ -39727,7 +39730,7 @@
    newargz[1] = find_executable(argv[0]);
    if (newargz[1] == NULL)
      lt_fatal("Couldn't find %s", argv[0]);
-@@ -4842,11 +5014,21 @@
+@@ -4842,11 +5014,21 @@ EOF
  
  EOF
  
@@ -39751,7 +39754,7 @@
  }
  
  void *
-@@ -4866,21 +5048,21 @@
+@@ -4866,21 +5048,21 @@ xstrdup (const char *string)
  ;
  }
  
@@ -39777,7 +39780,7 @@
  }
  
  int
-@@ -4893,9 +5075,16 @@
+@@ -4893,9 +5075,16 @@ check_executable(const char * path)
      return 0;
  
    if ((stat (path, &st) >= 0) &&
@@ -39796,7 +39799,7 @@
      return 1;
    else
      return 0;
-@@ -4909,7 +5098,6 @@
+@@ -4909,7 +5098,6 @@ find_executable (const char* wrapper)
    int has_slash = 0;
    const char* p;
    const char* p_next;
@@ -39804,7 +39807,7 @@
    /* static buffer for getcwd */
    char tmp[LT_PATHMAX + 1];
    int tmp_len;
-@@ -4922,7 +5110,7 @@
+@@ -4922,7 +5110,7 @@ find_executable (const char* wrapper)
  
    /* Absolute path? */
  #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
@@ -39813,7 +39816,7 @@
    {
      concat_name = xstrdup (wrapper);
      if (check_executable(concat_name))
-@@ -5045,22 +5233,22 @@
+@@ -5045,22 +5233,22 @@ lt_fatal (const char *message, ...)
    va_end (ap);
  }
  EOF
@@ -39847,7 +39850,7 @@
  #
  # The $output program cannot be directly executed until all the libtool
  # libraries that it depends on are installed.
-@@ -5075,7 +5263,7 @@
+@@ -5075,7 +5263,7 @@ sed_quote_subst='$sed_quote_subst'
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -39856,7 +39859,7 @@
  
  relink_command=\"$relink_command\"
  
-@@ -5134,7 +5322,7 @@
+@@ -5134,7 +5322,7 @@ else
    program=lt-'$outputname'$exeext
    progdir=\"\$thisdir/$objdir\"
  
@@ -39865,7 +39868,7 @@
       { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 
2>/dev/null | ${SED} 1q\`; \\
         test \"X\$file\" != \"X\$progdir/\$program\"; }; then
  
-@@ -5154,7 +5342,7 @@
+@@ -5154,7 +5342,7 @@ else
        else
        $echo \"\$relink_command_output\" >&2
        $rm \"\$progdir/\$file\"
@@ -39874,7 +39877,7 @@
        fi
      fi
  
-@@ -5204,26 +5392,26 @@
+@@ -5204,26 +5392,26 @@ else
        # Backslashes separate directories on plain windows
        *-*-mingw | *-*-os2*)
          $echo >> $output "\
@@ -39906,7 +39909,7 @@
    fi
  fi\
  "
-@@ -5252,71 +5440,73 @@
+@@ -5252,71 +5440,73 @@ fi\
  
        if test -n "$addlibs"; then
        gentop="$output_objdir/${outputname}x"
@@ -40037,7 +40040,7 @@
        eval cmds=\"$old_archive_cmds\"
  
        if len=`expr "X$cmds" : ".*"` &&
-@@ -5330,20 +5520,7 @@
+@@ -5330,20 +5520,7 @@ fi\
          objlist=
          concat_cmds=
          save_oldobjs=$oldobjs
@@ -40059,7 +40062,7 @@
          # Is there a better way of finding the last object in the list?
          for obj in $save_oldobjs
          do
-@@ -5354,7 +5531,7 @@
+@@ -5354,7 +5531,7 @@ fi\
            oldobjs="$objlist $obj"
            objlist="$objlist $obj"
            eval test_cmds=\"$old_archive_cmds\"
@@ -40068,7 +40071,7 @@
               test "$len" -le "$max_cmd_len"; then
              :
            else
-@@ -5417,6 +5594,7 @@
+@@ -5417,6 +5594,7 @@ fi\
        relink_command=
        fi
  
@@ -40076,7 +40079,7 @@
        # Only create the output if not a dry run.
        if test -z "$run"; then
        for installed in no yes; do
-@@ -5492,7 +5670,7 @@
+@@ -5492,7 +5670,7 @@ fi\
          esac
          $echo > $output "\
  # $outputname - a libtool library file
@@ -40085,7 +40088,7 @@
  #
  # Please DO NOT delete this file!
  # It is necessary for linking the library.
-@@ -5550,11 +5728,11 @@
+@@ -5550,11 +5728,11 @@ relink_command=\"$relink_command\""
      # install_prog (especially on Windows NT).
      if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
         # Allow the use of GNU shtool's install command.
@@ -40099,7 +40102,7 @@
        arg="\"$arg\""
        ;;
        esac
-@@ -5563,14 +5741,14 @@
+@@ -5563,14 +5741,14 @@ relink_command=\"$relink_command\""
        shift
      else
        install_prog=
@@ -40116,7 +40119,7 @@
        arg="\"$arg\""
        ;;
      esac
-@@ -5588,28 +5766,31 @@
+@@ -5588,28 +5766,31 @@ relink_command=\"$relink_command\""
      do
        if test -n "$dest"; then
        files="$files $dest"
@@ -40156,7 +40159,7 @@
          continue
        fi
        ;;
-@@ -5618,7 +5799,7 @@
+@@ -5618,7 +5799,7 @@ relink_command=\"$relink_command\""
        # Aesthetically quote the argument.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
        case $arg in
@@ -40165,7 +40168,7 @@
        arg="\"$arg\""
        ;;
        esac
-@@ -5702,7 +5883,7 @@
+@@ -5702,7 +5883,7 @@ relink_command=\"$relink_command\""
  
        *.la)
        # Check to see that this really is a libtool archive.
@@ -40174,7 +40177,7 @@
        else
          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2
-@@ -5787,11 +5968,14 @@
+@@ -5787,11 +5968,14 @@ relink_command=\"$relink_command\""
  
          if test "$#" -gt 0; then
            # Delete the old symlinks, and create new ones.
@@ -40191,7 +40194,7 @@
              fi
            done
          fi
-@@ -5804,7 +5988,16 @@
+@@ -5804,7 +5988,16 @@ relink_command=\"$relink_command\""
            IFS="$save_ifs"
            eval cmd=\"$cmd\"
            $show "$cmd"
@@ -40209,7 +40212,7 @@
          done
          IFS="$save_ifs"
        fi
-@@ -5894,21 +6087,19 @@
+@@ -5894,21 +6087,19 @@ relink_command=\"$relink_command\""
            wrapper=$file
            ;;
        esac
@@ -40240,7 +40243,7 @@
          esac
  
          # Check the variables that should have been set.
-@@ -5936,34 +6127,21 @@
+@@ -5936,34 +6127,21 @@ relink_command=\"$relink_command\""
          done
  
          relink_command=
@@ -40284,7 +40287,7 @@
              file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
              outputname="$tmpdir/$file"
              # Replace the output file specification.
-@@ -5987,7 +6165,7 @@
+@@ -5987,7 +6165,7 @@ relink_command=\"$relink_command\""
        fi
  
        # remove .exe since cygwin /usr/bin/install will append another
@@ -40293,7 +40296,7 @@
        case $install_prog,$host in
        */usr/bin/install*,*cygwin*)
          case $file:$destfile in
-@@ -6087,7 +6265,7 @@
+@@ -6087,7 +6265,7 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
      test "$show" = : && exit $EXIT_SUCCESS
  
@@ -40302,7 +40305,7 @@
      $echo "Libraries have been installed in:"
      for libdir in $libdirs; do
        $echo "   $libdir"
-@@ -6120,7 +6298,7 @@
+@@ -6120,7 +6298,7 @@ relink_command=\"$relink_command\""
      $echo
      $echo "See any operating system documentation about shared libraries for"
      $echo "more information, such as the ld(1) and ld.so(8) manual pages."
@@ -40311,7 +40314,7 @@
      exit $EXIT_SUCCESS
      ;;
  
-@@ -6148,7 +6326,7 @@
+@@ -6148,7 +6326,7 @@ relink_command=\"$relink_command\""
        case $file in
        *.la)
        # Check to see that this really is a libtool archive.
@@ -40320,7 +40323,7 @@
        else
          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
          $echo "$help" 1>&2
-@@ -6219,7 +6397,7 @@
+@@ -6219,7 +6397,7 @@ relink_command=\"$relink_command\""
        -*) ;;
        *)
        # Do a test to see if this is really a libtool program.
@@ -40329,7 +40332,7 @@
          # If there is no directory component, then add one.
          case $file in
          */* | *\\*) . $file ;;
-@@ -6313,9 +6491,9 @@
+@@ -6313,9 +6491,9 @@ relink_command=\"$relink_command\""
        fi
  
        # Don't error if the file doesn't exist and rm -f was used.
@@ -40342,7 +40345,7 @@
        :
        elif test -d "$file"; then
        exit_status=1
-@@ -6329,7 +6507,7 @@
+@@ -6329,7 +6507,7 @@ relink_command=\"$relink_command\""
        case $name in
        *.la)
        # Possibly a libtool archive, so verify it.
@@ -40351,7 +40354,7 @@
          . $dir/$name
  
          # Delete the libtool libraries and symlinks.
-@@ -6337,9 +6515,17 @@
+@@ -6337,9 +6515,17 @@ relink_command=\"$relink_command\""
            rmfiles="$rmfiles $objdir/$n"
          done
          test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -40371,7 +40374,7 @@
            if test -n "$library_names"; then
              # Do each command in the postuninstall commands.
              cmds=$postuninstall_cmds
-@@ -6372,26 +6558,27 @@
+@@ -6372,26 +6558,27 @@ relink_command=\"$relink_command\""
              IFS="$save_ifs"
            fi
            # FIXME: should reinstall the best remaining shared library.
@@ -40405,7 +40408,7 @@
            rmfiles="$rmfiles $dir/$non_pic_object"
          fi
        fi
-@@ -6410,7 +6597,7 @@
+@@ -6410,7 +6597,7 @@ relink_command=\"$relink_command\""
            ;;
          esac
          # Do a test to see if this is a libtool program.
@@ -40414,7 +40417,7 @@
            relink_command=
            . $dir/$noexename
  
-@@ -6458,7 +6645,7 @@
+@@ -6458,7 +6645,7 @@ relink_command=\"$relink_command\""
  fi # test -z "$show_help"
  
  if test -n "$exec_cmd"; then
@@ -40423,7 +40426,7 @@
    exit $EXIT_FAILURE
  fi
  
-@@ -6469,18 +6656,17 @@
+@@ -6469,18 +6656,17 @@ case $mode in
  
  Provide generalized library-building support services.
  
@@ -40453,7 +40456,7 @@
  
  MODE must be one of the following:
  
-@@ -6522,11 +6708,9 @@
+@@ -6522,11 +6708,9 @@ Compile a source file into a libtool lib
  This mode accepts the following additional options:
  
    -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
@@ -40466,7 +40469,7 @@
  
  COMPILE-COMMAND is a command to be used in creating a \`standard' object file
  from the given SOURCEFILE.
-@@ -6577,10 +6761,6 @@
+@@ -6577,10 +6761,6 @@ Install executables or libraries.
  INSTALL-COMMAND is the installation command.  The first component should be
  either the \`install' or \`cp' program.
  
@@ -40477,7 +40480,7 @@
  The rest of the components are interpreted as arguments to that command (only
  BSD-compatible install options are recognized)."
    ;;
-@@ -6619,8 +6799,6 @@
+@@ -6619,8 +6799,6 @@ The following components of LINK-COMMAND
    -release RELEASE  specify package release information
    -rpath LIBDIR     the created library will eventually be installed in LIBDIR
    -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
@@ -40486,7 +40489,7 @@
    -static           do not do any dynamic linking of libtool libraries
    -version-info CURRENT[:REVISION[:AGE]]
                    specify library version info [each variable defaults to 0]
-@@ -6666,7 +6844,7 @@
+@@ -6666,7 +6844,7 @@ esac
  $echo
  $echo "Try \`$modename --help' for more information about other modes."
  
@@ -40495,7 +40498,7 @@
  
  # The TAGs below are defined such that we never get into a situation
  # in which we disable both kinds of libraries.  Given conflicting
-@@ -6680,12 +6858,11 @@
+@@ -6680,12 +6858,11 @@ exit $EXIT_SUCCESS
  # configuration.  But we'll never go from static-only to shared-only.
  
  # ### BEGIN LIBTOOL TAG CONFIG: disable-shared

Added: packages/unstable/mozilla-bonobo/debian/patches/series
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/patches/series?rev=15931&op=file
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/patches/series (added)
+++ packages/unstable/mozilla-bonobo/debian/patches/series Mon May 12 20:23:59 
2008
@@ -1,0 +1,3 @@
+10_check-for-iceape-pkgconfig-files-in-configure.patch
+15_am-maintainer-mode.patch
+70_mandatory-relibtoolize.patch

Modified: packages/unstable/mozilla-bonobo/debian/rules
URL: 
http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/mozilla-bonobo/debian/rules?rev=15931&op=diff
==============================================================================
--- packages/unstable/mozilla-bonobo/debian/rules (original)
+++ packages/unstable/mozilla-bonobo/debian/rules Mon May 12 20:23:59 2008
@@ -4,7 +4,7 @@
 
 # CDBS classes & rules
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk






reply via email to

[Prev in Thread] Current Thread [Next in Thread]