r15998 - in /desktop/unstable/gdm/debian: changelog control patches/01_crash_on_shutdown.patch patches/70_mandatory-relibtoolize.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Wed May 21 10:15:29 UTC 2008


Author: slomo
Date: Wed May 21 10:15:29 2008
New Revision: 15998

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15998
Log:
* New upstream bugfix release:
  + debian/patches/01_crash_on_shutdown.patch:
    - Dropped, merged upstream.
  + debian/patches/70_mandatory-relibtoolize.patch:
    - Regenerated for the new version.

Removed:
    desktop/unstable/gdm/debian/patches/01_crash_on_shutdown.patch
Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/control
    desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch
    desktop/unstable/gdm/debian/patches/series

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=15998&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Wed May 21 10:15:29 2008
@@ -1,3 +1,13 @@
+gdm (2.20.6-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/01_crash_on_shutdown.patch:
+      - Dropped, merged upstream.
+    + debian/patches/70_mandatory-relibtoolize.patch:
+      - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 21 May 2008 11:59:42 +0200
+
 gdm (2.20.5-2) unstable; urgency=low
 
   * Xsession: set the USERXSESSIONRC variable. Thanks to Yves-Alexis 

Modified: desktop/unstable/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control?rev=15998&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control (original)
+++ desktop/unstable/gdm/debian/control Wed May 21 10:15:29 2008
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: libpam0g-dev,
                libdbus-glib-1-dev (>= 0.30),
                libglib2.0-dev (>= 2.12.0),

Modified: desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch?rev=15998&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch Wed May 21 10:15:29 2008
@@ -1,6 +1,6 @@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/aclocal.m4 gdm-2.20.5/aclocal.m4
---- gdm-2.20.5.old/aclocal.m4	2008-04-07 22:31:22.000000000 +0200
-+++ gdm-2.20.5/aclocal.m4	2008-04-08 12:12:50.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/aclocal.m4 gdm-2.20.6/aclocal.m4
+--- gdm-2.20.6.old/aclocal.m4	2008-05-13 02:27:10.000000000 +0200
++++ gdm-2.20.6/aclocal.m4	2008-05-21 12:11:23.000000000 +0200
 @@ -1,7 +1,7 @@
 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
 +# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -1097,7 +1097,7 @@
 +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
 -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
  
 -# Check to see how 'make' treats includes.	            -*- Autoconf -*-
  
@@ -14313,9 +14313,9 @@
  
  m4_include([m4/gnome-doc-utils.m4])
  m4_include([m4/intltool.m4])
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/common/Makefile.in gdm-2.20.5/common/Makefile.in
---- gdm-2.20.5.old/common/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/common/Makefile.in	2008-04-08 12:13:13.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/common/Makefile.in gdm-2.20.6/common/Makefile.in
+--- gdm-2.20.6.old/common/Makefile.in	2008-05-13 02:27:19.000000000 +0200
++++ gdm-2.20.6/common/Makefile.in	2008-05-21 12:11:30.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -14398,9 +14398,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/config/Makefile.in gdm-2.20.5/config/Makefile.in
---- gdm-2.20.5.old/config/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/config/Makefile.in	2008-04-08 12:13:14.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/config/Makefile.in gdm-2.20.6/config/Makefile.in
+--- gdm-2.20.6.old/config/Makefile.in	2008-05-13 02:27:19.000000000 +0200
++++ gdm-2.20.6/config/Makefile.in	2008-05-21 12:11:30.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -14436,9 +14436,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/configure gdm-2.20.5/configure
---- gdm-2.20.5.old/configure	2008-04-07 22:31:29.000000000 +0200
-+++ gdm-2.20.5/configure	2008-04-08 12:13:08.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/configure gdm-2.20.6/configure
+--- gdm-2.20.6.old/configure	2008-05-13 02:27:18.000000000 +0200
++++ gdm-2.20.6/configure	2008-05-21 12:11:29.000000000 +0200
 @@ -899,10 +899,13 @@
  host_cpu
  host_vendor
@@ -14453,7 +14453,7 @@
  CXX
  CXXFLAGS
  ac_ct_CXX
-@@ -4004,7 +4007,8 @@
+@@ -4006,7 +4009,8 @@
  fi
  xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
  mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
@@ -14463,7 +14463,7 @@
      { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
  echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
     { (exit 1); exit 1; }; }
-@@ -6265,12 +6269,13 @@
+@@ -6267,12 +6271,13 @@
    test -z "$as_dir" && as_dir=.
    for lt_ac_prog in sed gsed; do
      for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14478,7 +14478,7 @@
  lt_ac_max=0
  lt_ac_count=0
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6305,6 +6310,7 @@
+@@ -6307,6 +6312,7 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -14486,7 +14486,7 @@
  { echo "$as_me:$LINENO: result: $SED" >&5
  echo "${ECHO_T}$SED" >&6; }
  
-@@ -6504,8 +6510,8 @@
+@@ -6506,8 +6512,8 @@
  echo "${ECHO_T}no, using $LN_S" >&6; }
  fi
  
@@ -14497,7 +14497,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6524,7 +6530,7 @@
+@@ -6526,7 +6532,7 @@
  # whether `pass_all' will *always* work, you probably want this one.
  
  case $host_os in
@@ -14506,7 +14506,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -6546,16 +6552,22 @@
+@@ -6548,16 +6554,22 @@
  
  mingw* | pw32*)
    # Base MSYS/MinGW do not provide the 'file' command needed by
@@ -14533,7 +14533,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -6593,7 +6605,7 @@
+@@ -6595,7 +6607,7 @@
    esac
    ;;
  
@@ -14542,7 +14542,7 @@
    # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
    ;;
-@@ -6609,11 +6621,11 @@
+@@ -6611,11 +6623,11 @@
    ;;
  
  # This must be Linux ELF.
@@ -14556,7 +14556,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -6643,6 +6655,10 @@
+@@ -6645,6 +6657,10 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -14567,16 +14567,16 @@
  solaris*)
    lt_cv_deplibs_check_method=pass_all
    ;;
-@@ -6729,7 +6745,7 @@
+@@ -6731,7 +6747,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 6732 "configure"' > conftest.$ac_ext
-+  echo '#line 6748 "configure"' > conftest.$ac_ext
+-  echo '#line 6734 "configure"' > conftest.$ac_ext
++  echo '#line 6750 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -6764,7 +6780,8 @@
+@@ -6766,7 +6782,8 @@
    rm -rf conftest*
    ;;
  
@@ -14586,7 +14586,7 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6775,6 +6792,9 @@
+@@ -6777,6 +6794,9 @@
      case `/usr/bin/file conftest.o` in
      *32-bit*)
        case $host in
@@ -14596,7 +14596,7 @@
          x86_64-*linux*)
            LD="${LD-ld} -m elf_i386"
            ;;
-@@ -6791,6 +6811,9 @@
+@@ -6793,6 +6813,9 @@
        ;;
      *64-bit*)
        case $host in
@@ -14606,7 +14606,7 @@
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
            ;;
-@@ -6894,7 +6917,11 @@
+@@ -6896,7 +6919,11 @@
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
        yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -14619,7 +14619,7 @@
        esac
        ;;
      esac
-@@ -8086,7 +8113,6 @@
+@@ -8088,7 +8115,6 @@
  
  
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -14627,7 +14627,7 @@
  # find the maximum length of command line arguments
  { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
  echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -8173,24 +8199,27 @@
+@@ -8175,24 +8201,27 @@
      fi
      ;;
    *)
@@ -14672,7 +14672,7 @@
      ;;
    esac
  
-@@ -8207,6 +8236,7 @@
+@@ -8209,6 +8238,7 @@
  
  
  
@@ -14680,7 +14680,7 @@
  # Check for command to grab the raw symbol name followed by C symbol from nm.
  { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
  echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -8244,7 +8274,7 @@
+@@ -8246,7 +8276,7 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -14689,7 +14689,7 @@
    if test "$host_cpu" = ia64; then
      symcode='[ABCDGIRSTW]'
      lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-@@ -8397,7 +8427,7 @@
+@@ -8399,7 +8429,7 @@
      echo "$progname: failed program was:" >&5
      cat conftest.$ac_ext >&5
    fi
@@ -14698,7 +14698,7 @@
  
    # Do not use the global_symbol_pipe unless it works.
    if test "$pipe_works" = yes; then
-@@ -8795,7 +8825,7 @@
+@@ -8797,7 +8827,7 @@
  test -z "$ac_objext" && ac_objext=o
  
  # Determine commands to create old-style static archives.
@@ -14707,7 +14707,7 @@
  old_postinstall_cmds='chmod 644 $oldlib'
  old_postuninstall_cmds=
  
-@@ -8957,6 +8987,318 @@
+@@ -8959,6 +8989,318 @@
    ;;
  esac
  
@@ -15026,7 +15026,7 @@
  enable_dlopen=no
  enable_win32_dll=no
  
-@@ -8995,10 +9337,10 @@
+@@ -8997,10 +9339,10 @@
  objext=$objext
  
  # Code to be used in simple compile tests
@@ -15039,7 +15039,7 @@
  
  
  # If no C compiler was specified, use CC.
-@@ -9013,16 +9355,16 @@
+@@ -9015,16 +9357,16 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -15059,7 +15059,7 @@
  
  
  
-@@ -9039,7 +9381,7 @@
+@@ -9041,7 +9383,7 @@
  else
    lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
@@ -15068,21 +15068,21 @@
     lt_compiler_flag="-fno-rtti -fno-exceptions"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -9050,11 +9392,11 @@
+@@ -9052,11 +9394,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9053: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9395: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9055: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9397: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9057: \$? = $ac_status" >&5
-+   echo "$as_me:9399: \$? = $ac_status" >&5
+-   echo "$as_me:9059: \$? = $ac_status" >&5
++   echo "$as_me:9401: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -9105,13 +9447,15 @@
+@@ -9107,13 +9449,15 @@
        lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
        ;;
  
@@ -15100,7 +15100,7 @@
        lt_prog_compiler_pic='-DDLL_EXPORT'
        ;;
  
-@@ -9121,7 +9465,7 @@
+@@ -9123,7 +9467,7 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -15109,7 +15109,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -9179,7 +9523,7 @@
+@@ -9181,7 +9525,7 @@
         esac
         ;;
  
@@ -15118,7 +15118,7 @@
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -9212,7 +9556,7 @@
+@@ -9214,7 +9558,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -15127,7 +15127,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl='-Wl,'
-@@ -9231,6 +9575,22 @@
+@@ -9233,6 +9577,22 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static='-non_shared'
          ;;
@@ -15150,7 +15150,7 @@
        esac
        ;;
  
-@@ -9240,6 +9600,10 @@
+@@ -9242,6 +9602,10 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -15161,7 +15161,7 @@
      solaris*)
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9302,12 +9666,12 @@
+@@ -9304,12 +9668,12 @@
  
  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
@@ -15177,17 +15177,17 @@
     lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -9318,27 +9682,27 @@
+@@ -9320,27 +9684,27 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9321: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9685: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9323: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9687: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9325: \$? = $ac_status" >&5
-+   echo "$as_me:9689: \$? = $ac_status" >&5
+-   echo "$as_me:9327: \$? = $ac_status" >&5
++   echo "$as_me:9691: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -15211,7 +15211,7 @@
      case $lt_prog_compiler_pic in
       "" | " "*) ;;
       *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9365,13 +9729,13 @@
+@@ -9367,13 +9731,13 @@
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
  { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -15228,7 +15228,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -9381,20 +9745,20 @@
+@@ -9383,20 +9747,20 @@
         $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
@@ -15255,7 +15255,7 @@
      :
  else
      lt_prog_compiler_static=
-@@ -9411,7 +9775,7 @@
+@@ -9413,7 +9777,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -15264,21 +15264,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -9422,11 +9786,11 @@
+@@ -9424,11 +9788,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9425: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9789: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9427: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9791: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9429: \$? = $ac_status" >&5
-+   echo "$as_me:9793: \$? = $ac_status" >&5
+-   echo "$as_me:9431: \$? = $ac_status" >&5
++   echo "$as_me:9795: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -9506,12 +9870,13 @@
+@@ -9508,12 +9872,13 @@
    # it will be wrapped by ` (' and `)$', so one must not match beginning or
    # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    # as well as any symbol that contains `d'.
@@ -15293,7 +15293,7 @@
    extract_expsyms_cmds=
    # Just being paranoid about ensuring that cc_basename is set.
    for cc_temp in $compiler""; do
-@@ -9570,7 +9935,7 @@
+@@ -9572,7 +9937,7 @@
  
      # See if GNU ld supports shared libraries.
      case $host_os in
@@ -15302,7 +15302,7 @@
        # On AIX/PPC, the GNU linker is very broken
        if test "$host_cpu" != ia64; then
  	ld_shlibs=no
-@@ -9618,7 +9983,7 @@
+@@ -9620,7 +9985,7 @@
        allow_undefined_flag=unsupported
        always_export_symbols=no
        enable_shared_with_static_runtimes=yes
@@ -15311,7 +15311,7 @@
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -9636,7 +10001,7 @@
+@@ -9638,7 +10003,7 @@
        fi
        ;;
  
@@ -15320,7 +15320,7 @@
        hardcode_direct=no
        hardcode_shlibpath_var=no
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9651,7 +10016,7 @@
+@@ -9653,7 +10018,7 @@
        archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -15329,7 +15329,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -9669,20 +10034,30 @@
+@@ -9671,20 +10036,30 @@
  	ifc* | ifort*)			# Intel Fortran compiler
  	  tmp_addflag=' -nofor_main' ;;
  	esac
@@ -15363,7 +15363,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -9780,7 +10155,7 @@
+@@ -9782,7 +10157,7 @@
        fi
        ;;
  
@@ -15372,7 +15372,7 @@
        if test "$host_cpu" = ia64; then
  	# On IA64, the linker does run time linking by default, so we don't
  	# have to do anything special.
-@@ -9800,7 +10175,7 @@
+@@ -9802,7 +10177,7 @@
  	# Test if we are trying to use run time linking or normal
  	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
  	# need to do runtime linking.
@@ -15381,7 +15381,7 @@
  	  for ld_flag in $LDFLAGS; do
    	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
    	    aix_use_runtimelinking=yes
-@@ -9834,7 +10209,7 @@
+@@ -9836,7 +10211,7 @@
    	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	  then
    	  # We have reworked collect2
@@ -15390,7 +15390,7 @@
  	  else
    	  # We have old collect2
    	  hardcode_direct=unsupported
-@@ -9908,11 +10283,18 @@
+@@ -9910,11 +10285,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -15413,7 +15413,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9967,11 +10349,18 @@
+@@ -9969,11 +10351,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -15436,7 +15436,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -10025,7 +10414,7 @@
+@@ -10027,7 +10416,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
@@ -15445,7 +15445,7 @@
        fix_srcfile_path='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes=yes
        ;;
-@@ -10058,19 +10447,18 @@
+@@ -10060,19 +10449,18 @@
        link_all_deplibs=yes
      if test "$GCC" = yes ; then
      	output_verbose_link_cmd='echo'
@@ -15471,7 +15471,7 @@
            module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -10110,7 +10498,7 @@
+@@ -10112,7 +10500,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15480,7 +15480,7 @@
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -10212,7 +10600,7 @@
+@@ -10214,7 +10602,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15489,7 +15489,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10232,24 +10620,28 @@
+@@ -10234,24 +10622,28 @@
        ;;
  
      openbsd*)
@@ -15535,7 +15535,7 @@
        fi
        ;;
  
-@@ -10308,17 +10700,16 @@
+@@ -10310,17 +10702,16 @@
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
        *)
@@ -15562,7 +15562,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10375,7 +10766,7 @@
+@@ -10377,7 +10768,7 @@
        fi
        ;;
  
@@ -15571,7 +15571,7 @@
        no_undefined_flag='${wl}-z,text'
        archive_cmds_need_lc=no
        hardcode_shlibpath_var=no
-@@ -10452,7 +10843,7 @@
+@@ -10454,7 +10845,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -15580,7 +15580,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -10510,17 +10901,55 @@
+@@ -10512,17 +10903,55 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15640,7 +15640,7 @@
  else
    sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
  fi
-@@ -10541,7 +10970,7 @@
+@@ -10543,7 +10972,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
@@ -15649,7 +15649,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10680,12 +11109,8 @@
+@@ -10682,12 +11111,8 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -15664,7 +15664,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -10702,18 +11127,6 @@
+@@ -10704,18 +11129,6 @@
    dynamic_linker=no
    ;;
  
@@ -15683,7 +15683,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -10751,7 +11164,7 @@
+@@ -10753,7 +11166,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -15692,7 +15692,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10814,7 +11227,7 @@
+@@ -10816,7 +11229,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -15701,7 +15701,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10869,7 +11282,7 @@
+@@ -10871,7 +11284,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -15710,7 +15710,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10885,7 +11298,7 @@
+@@ -10887,7 +11300,7 @@
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -15719,7 +15719,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -10898,7 +11311,7 @@
+@@ -10900,7 +11313,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -15728,7 +15728,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10907,7 +11320,7 @@
+@@ -10909,7 +11322,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -15737,7 +15737,7 @@
    ;;
  
  netbsd*)
-@@ -10991,6 +11404,10 @@
+@@ -10993,6 +11406,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -15748,7 +15748,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11087,6 +11504,21 @@
+@@ -11089,6 +11506,21 @@
  echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
@@ -15770,7 +15770,7 @@
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
  if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -11144,6 +11576,7 @@
+@@ -11146,6 +11578,7 @@
     darwin*)
         if test -n "$STRIP" ; then
           striplib="$STRIP -x"
@@ -15778,7 +15778,7 @@
           { echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
         else
-@@ -11405,7 +11838,7 @@
+@@ -11407,7 +11840,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
  echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
  if test $ac_cv_lib_dld_shl_load = yes; then
@@ -15787,7 +15787,7 @@
  else
    { echo "$as_me:$LINENO: checking for dlopen" >&5
  echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11681,7 +12114,7 @@
+@@ -11683,7 +12116,7 @@
  { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
  echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
  if test $ac_cv_lib_dld_dld_link = yes; then
@@ -15796,25 +15796,25 @@
  fi
  
  
-@@ -11730,7 +12163,7 @@
+@@ -11732,7 +12165,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11733 "configure"
-+#line 12166 "configure"
+-#line 11735 "configure"
++#line 12168 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11830,7 +12263,7 @@
+@@ -11832,7 +12265,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11833 "configure"
-+#line 12266 "configure"
+-#line 11835 "configure"
++#line 12268 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11957,7 +12390,7 @@
+@@ -11959,7 +12392,7 @@
    fi
    ;;
  
@@ -15823,7 +15823,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -12013,6 +12446,7 @@
+@@ -12015,6 +12448,7 @@
      predeps \
      postdeps \
      compiler_lib_search_path \
@@ -15831,7 +15831,7 @@
      archive_cmds \
      archive_expsym_cmds \
      postinstall_cmds \
-@@ -12028,6 +12462,7 @@
+@@ -12030,6 +12464,7 @@
      module_cmds \
      module_expsym_cmds \
      lt_cv_prog_compiler_c_o \
@@ -15839,7 +15839,7 @@
      exclude_expsyms \
      include_expsyms; do
  
-@@ -12072,7 +12507,7 @@
+@@ -12074,7 +12509,7 @@
  # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
  # NOTE: Changes made to this file will be lost: look at ltmain.sh.
  #
@@ -15848,7 +15848,7 @@
  # Free Software Foundation, Inc.
  #
  # This file is part of GNU Libtool:
-@@ -12308,6 +12743,10 @@
+@@ -12310,6 +12745,10 @@
  # shared library.
  postdeps=$lt_postdeps
  
@@ -15859,7 +15859,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -12396,7 +12835,7 @@
+@@ -12398,7 +12837,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -15868,7 +15868,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols
-@@ -12556,6 +12995,7 @@
+@@ -12558,6 +12997,7 @@
  predeps_CXX=
  postdeps_CXX=
  compiler_lib_search_path_CXX=
@@ -15876,7 +15876,7 @@
  
  # Source file extension for C++ test sources.
  ac_ext=cpp
-@@ -12565,10 +13005,10 @@
+@@ -12567,10 +13007,10 @@
  objext_CXX=$objext
  
  # Code to be used in simple compile tests
@@ -15889,7 +15889,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -12584,16 +13024,16 @@
+@@ -12586,16 +13026,16 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -15909,7 +15909,7 @@
  
  
  # Allow CC to be a program name with arguments.
-@@ -12800,7 +13240,7 @@
+@@ -12802,7 +13242,7 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -15918,7 +15918,7 @@
      if test "$host_cpu" = ia64; then
        # On IA64, the linker does run time linking by default, so we don't
        # have to do anything special.
-@@ -12813,7 +13253,7 @@
+@@ -12815,7 +13255,7 @@
        # Test if we are trying to use run time linking or normal
        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
        # need to do runtime linking.
@@ -15927,7 +15927,7 @@
  	for ld_flag in $LDFLAGS; do
  	  case $ld_flag in
  	  *-brtl*)
-@@ -12849,7 +13289,7 @@
+@@ -12851,7 +13291,7 @@
  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	then
  	  # We have reworked collect2
@@ -15936,7 +15936,7 @@
  	else
  	  # We have old collect2
  	  hardcode_direct_CXX=unsupported
-@@ -12923,11 +13363,18 @@
+@@ -12925,11 +13365,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -15959,7 +15959,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12983,11 +13430,18 @@
+@@ -12985,11 +13432,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -15982,7 +15982,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -13057,59 +13511,31 @@
+@@ -13059,59 +13513,31 @@
      fi
    ;;
        darwin* | rhapsody*)
@@ -16053,7 +16053,7 @@
            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -13143,7 +13569,7 @@
+@@ -13145,7 +13571,7 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -16062,7 +16062,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13192,9 +13618,7 @@
+@@ -13194,9 +13620,7 @@
        hardcode_libdir_separator_CXX=:
  
        case $host_cpu in
@@ -16073,7 +16073,7 @@
        *)
  	export_dynamic_flag_spec_CXX='${wl}-E'
          ;;
-@@ -13262,7 +13686,7 @@
+@@ -13264,7 +13688,7 @@
  	;;
      esac
      ;;
@@ -16082,7 +16082,7 @@
      hardcode_direct_CXX=no
      hardcode_shlibpath_var_CXX=no
      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13302,7 +13726,7 @@
+@@ -13304,7 +13728,7 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -16091,7 +16091,7 @@
      case $cc_basename in
        KCC*)
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13354,7 +13778,7 @@
+@@ -13356,7 +13780,7 @@
  	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
  	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
  	;;
@@ -16100,7 +16100,7 @@
          # Portland Group C++ compiler
  	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
    	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -13382,6 +13806,29 @@
+@@ -13384,6 +13808,29 @@
  	# dependencies.
  	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
  	;;
@@ -16130,7 +16130,7 @@
      esac
      ;;
    lynxos*)
-@@ -13404,7 +13851,7 @@
+@@ -13406,7 +13853,7 @@
  	;;
      esac
      ;;
@@ -16139,7 +16139,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13420,16 +13867,20 @@
+@@ -13422,16 +13869,20 @@
      ld_shlibs_CXX=no
      ;;
    openbsd*)
@@ -16169,7 +16169,7 @@
      ;;
    osf3*)
      case $cc_basename in
-@@ -13591,15 +14042,10 @@
+@@ -13593,15 +14044,10 @@
  	case $host_os in
  	  solaris2.[0-5] | solaris2.[0-5].*) ;;
  	  *)
@@ -16188,7 +16188,7 @@
  	    ;;
  	esac
  	link_all_deplibs_CXX=yes
-@@ -13646,6 +14092,12 @@
+@@ -13648,6 +14094,12 @@
  	  fi
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -16201,7 +16201,7 @@
  	fi
  	;;
      esac
-@@ -13733,7 +14185,6 @@
+@@ -13735,7 +14187,6 @@
  GCC_CXX="$GXX"
  LD_CXX="$LD"
  
@@ -16209,7 +16209,7 @@
  cat > conftest.$ac_ext <<EOF
  class Foo
  {
-@@ -13835,9 +14286,14 @@
+@@ -13837,9 +14288,14 @@
  
  $rm -f confest.$objext
  
@@ -16225,7 +16225,7 @@
    # Interix 3.5 installs completely hosed .la files for C++, so rather than
    # hack all around it, let's just trust "g++" to DTRT.
    predep_objects_CXX=
-@@ -13845,19 +14301,51 @@
+@@ -13847,19 +14303,51 @@
    postdeps_CXX=
    ;;
  
@@ -16279,7 +16279,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13888,12 +14376,14 @@
+@@ -13890,12 +14378,14 @@
        # like `-m68040'.
        lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
        ;;
@@ -16296,7 +16296,7 @@
        lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
        ;;
      darwin* | rhapsody*)
-@@ -13905,7 +14395,7 @@
+@@ -13907,7 +14397,7 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -16305,7 +16305,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -13931,7 +14421,7 @@
+@@ -13933,7 +14423,7 @@
      esac
    else
      case $host_os in
@@ -16314,7 +16314,7 @@
  	# All AIX code is PIC.
  	if test "$host_cpu" = ia64; then
  	  # AIX 5 now supports IA64 processor
-@@ -13971,7 +14461,7 @@
+@@ -13973,7 +14463,7 @@
  	    ;;
  	esac
  	;;
@@ -16323,7 +16323,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -14014,7 +14504,7 @@
+@@ -14016,7 +14506,7 @@
  	    ;;
  	esac
  	;;
@@ -16332,7 +16332,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -14027,7 +14517,7 @@
+@@ -14029,7 +14519,7 @@
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    lt_prog_compiler_static_CXX='-static'
  	    ;;
@@ -16341,7 +16341,7 @@
  	    # Portland Group C++ compiler.
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_pic_CXX='-fpic'
-@@ -14041,6 +14531,14 @@
+@@ -14043,6 +14533,14 @@
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    ;;
  	  *)
@@ -16356,7 +16356,7 @@
  	    ;;
  	esac
  	;;
-@@ -14057,7 +14555,7 @@
+@@ -14059,7 +14557,7 @@
  	    ;;
  	esac
  	;;
@@ -16365,7 +16365,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -14150,12 +14648,12 @@
+@@ -14152,12 +14650,12 @@
  
  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
  echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
@@ -16381,17 +16381,17 @@
     lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -14166,27 +14664,27 @@
+@@ -14168,27 +14666,27 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14169: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14667: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14171: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14669: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:14173: \$? = $ac_status" >&5
-+   echo "$as_me:14671: \$? = $ac_status" >&5
+-   echo "$as_me:14175: \$? = $ac_status" >&5
++   echo "$as_me:14673: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -16415,7 +16415,7 @@
      case $lt_prog_compiler_pic_CXX in
       "" | " "*) ;;
       *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -14213,13 +14711,13 @@
+@@ -14215,13 +14713,13 @@
  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
  { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -16432,7 +16432,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -14229,20 +14727,20 @@
+@@ -14231,20 +14729,20 @@
         $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
@@ -16459,7 +16459,7 @@
      :
  else
      lt_prog_compiler_static_CXX=
-@@ -14259,7 +14757,7 @@
+@@ -14261,7 +14759,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -16468,21 +16468,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -14270,11 +14768,11 @@
+@@ -14272,11 +14770,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14273: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14771: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:14275: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14773: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:14277: \$? = $ac_status" >&5
-+   echo "$as_me:14775: \$? = $ac_status" >&5
+-   echo "$as_me:14279: \$? = $ac_status" >&5
++   echo "$as_me:14777: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -14327,7 +14825,7 @@
+@@ -14329,7 +14827,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
@@ -16491,7 +16491,7 @@
      # If we're using GNU nm, then we don't want the "-C" option.
      # -C means demangle to AIX nm, but means don't demangle with GNU nm
      if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -14340,12 +14838,16 @@
+@@ -14342,12 +14840,16 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -16509,7 +16509,7 @@
  
  { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
  echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14371,7 +14873,7 @@
+@@ -14373,7 +14875,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -16518,7 +16518,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -14429,20 +14931,7 @@
+@@ -14431,20 +14933,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16540,7 +16540,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14460,7 +14949,7 @@
+@@ -14462,7 +14951,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
@@ -16549,7 +16549,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14599,12 +15088,7 @@
+@@ -14601,12 +15090,7 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -16563,7 +16563,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -14621,18 +15105,6 @@
+@@ -14623,18 +15107,6 @@
    dynamic_linker=no
    ;;
  
@@ -16582,7 +16582,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -14670,7 +15142,7 @@
+@@ -14672,7 +15144,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -16591,7 +16591,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -14733,7 +15205,7 @@
+@@ -14735,7 +15207,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -16600,7 +16600,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14788,7 +15260,7 @@
+@@ -14790,7 +15262,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -16609,7 +16609,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14804,7 +15276,7 @@
+@@ -14806,7 +15278,7 @@
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -16618,7 +16618,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -14817,7 +15289,7 @@
+@@ -14819,7 +15291,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -16627,7 +16627,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14826,7 +15298,7 @@
+@@ -14828,7 +15300,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -16636,7 +16636,7 @@
    ;;
  
  netbsd*)
-@@ -14910,6 +15382,10 @@
+@@ -14912,6 +15384,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -16647,7 +16647,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -15006,6 +15482,21 @@
+@@ -15008,6 +15484,21 @@
  echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
@@ -16669,7 +16669,7 @@
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
  if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -15089,6 +15580,7 @@
+@@ -15091,6 +15582,7 @@
      predeps_CXX \
      postdeps_CXX \
      compiler_lib_search_path_CXX \
@@ -16677,7 +16677,7 @@
      archive_cmds_CXX \
      archive_expsym_cmds_CXX \
      postinstall_cmds_CXX \
-@@ -15104,6 +15596,7 @@
+@@ -15106,6 +15598,7 @@
      module_cmds_CXX \
      module_expsym_cmds_CXX \
      lt_cv_prog_compiler_c_o_CXX \
@@ -16685,7 +16685,7 @@
      exclude_expsyms_CXX \
      include_expsyms_CXX; do
  
-@@ -15336,6 +15829,10 @@
+@@ -15338,6 +15831,10 @@
  # shared library.
  postdeps=$lt_postdeps_CXX
  
@@ -16696,7 +16696,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -15424,7 +15921,7 @@
+@@ -15426,7 +15923,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -16705,7 +16705,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_CXX
-@@ -15515,10 +16012,17 @@
+@@ -15517,10 +16014,17 @@
  objext_F77=$objext
  
  # Code to be used in simple compile tests
@@ -16725,7 +16725,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -15534,16 +16038,16 @@
+@@ -15536,16 +16040,16 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -16745,7 +16745,7 @@
  
  
  # Allow CC to be a program name with arguments.
-@@ -15581,7 +16085,7 @@
+@@ -15583,7 +16087,7 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -16754,7 +16754,7 @@
    if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
      test "$enable_shared" = yes && enable_static=no
    fi
-@@ -15627,13 +16131,15 @@
+@@ -15629,13 +16133,15 @@
        lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
        ;;
  
@@ -16772,7 +16772,7 @@
        lt_prog_compiler_pic_F77='-DDLL_EXPORT'
        ;;
  
-@@ -15643,7 +16149,7 @@
+@@ -15645,7 +16151,7 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -16781,7 +16781,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -15701,7 +16207,7 @@
+@@ -15703,7 +16209,7 @@
         esac
         ;;
  
@@ -16790,7 +16790,7 @@
        # This hack is so that the source file can tell whether it is being
        # built for inclusion in a dll (and should export symbols for example).
        lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -15734,7 +16240,7 @@
+@@ -15736,7 +16242,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -16799,7 +16799,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_F77='-Wl,'
-@@ -15753,6 +16259,22 @@
+@@ -15755,6 +16261,22 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static_F77='-non_shared'
          ;;
@@ -16822,7 +16822,7 @@
        esac
        ;;
  
-@@ -15762,6 +16284,10 @@
+@@ -15764,6 +16286,10 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -16833,7 +16833,7 @@
      solaris*)
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -15824,12 +16350,12 @@
+@@ -15826,12 +16352,12 @@
  
  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
  echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
@@ -16849,17 +16849,17 @@
     lt_compiler_flag="$lt_prog_compiler_pic_F77"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -15840,27 +16366,27 @@
+@@ -15842,27 +16368,27 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15843: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16369: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15845: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16371: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:15847: \$? = $ac_status" >&5
-+   echo "$as_me:16373: \$? = $ac_status" >&5
+-   echo "$as_me:15849: \$? = $ac_status" >&5
++   echo "$as_me:16375: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -16883,7 +16883,7 @@
      case $lt_prog_compiler_pic_F77 in
       "" | " "*) ;;
       *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15887,13 +16413,13 @@
+@@ -15889,13 +16415,13 @@
  wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
  { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -16900,7 +16900,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -15903,20 +16429,20 @@
+@@ -15905,20 +16431,20 @@
         $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
@@ -16927,7 +16927,7 @@
      :
  else
      lt_prog_compiler_static_F77=
-@@ -15933,7 +16459,7 @@
+@@ -15935,7 +16461,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -16936,21 +16936,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -15944,11 +16470,11 @@
+@@ -15946,11 +16472,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:15947: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16473: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15949: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16475: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:15951: \$? = $ac_status" >&5
-+   echo "$as_me:16477: \$? = $ac_status" >&5
+-   echo "$as_me:15953: \$? = $ac_status" >&5
++   echo "$as_me:16479: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -16028,12 +16554,13 @@
+@@ -16030,12 +16556,13 @@
    # it will be wrapped by ` (' and `)$', so one must not match beginning or
    # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    # as well as any symbol that contains `d'.
@@ -16965,7 +16965,7 @@
    extract_expsyms_cmds=
    # Just being paranoid about ensuring that cc_basename is set.
    for cc_temp in $compiler""; do
-@@ -16092,7 +16619,7 @@
+@@ -16094,7 +16621,7 @@
  
      # See if GNU ld supports shared libraries.
      case $host_os in
@@ -16974,7 +16974,7 @@
        # On AIX/PPC, the GNU linker is very broken
        if test "$host_cpu" != ia64; then
  	ld_shlibs_F77=no
-@@ -16140,7 +16667,7 @@
+@@ -16142,7 +16669,7 @@
        allow_undefined_flag_F77=unsupported
        always_export_symbols_F77=no
        enable_shared_with_static_runtimes_F77=yes
@@ -16983,7 +16983,7 @@
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -16158,7 +16685,7 @@
+@@ -16160,7 +16687,7 @@
        fi
        ;;
  
@@ -16992,7 +16992,7 @@
        hardcode_direct_F77=no
        hardcode_shlibpath_var_F77=no
        hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16173,7 +16700,7 @@
+@@ -16175,7 +16702,7 @@
        archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -17001,7 +17001,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -16191,20 +16718,30 @@
+@@ -16193,20 +16720,30 @@
  	ifc* | ifort*)			# Intel Fortran compiler
  	  tmp_addflag=' -nofor_main' ;;
  	esac
@@ -17035,7 +17035,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -16302,7 +16839,7 @@
+@@ -16304,7 +16841,7 @@
        fi
        ;;
  
@@ -17044,7 +17044,7 @@
        if test "$host_cpu" = ia64; then
  	# On IA64, the linker does run time linking by default, so we don't
  	# have to do anything special.
-@@ -16322,7 +16859,7 @@
+@@ -16324,7 +16861,7 @@
  	# Test if we are trying to use run time linking or normal
  	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
  	# need to do runtime linking.
@@ -17053,7 +17053,7 @@
  	  for ld_flag in $LDFLAGS; do
    	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
    	    aix_use_runtimelinking=yes
-@@ -16356,7 +16893,7 @@
+@@ -16358,7 +16895,7 @@
    	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	  then
    	  # We have reworked collect2
@@ -17062,7 +17062,7 @@
  	  else
    	  # We have old collect2
    	  hardcode_direct_F77=unsupported
-@@ -16420,11 +16957,18 @@
+@@ -16422,11 +16959,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -17085,7 +17085,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16469,11 +17013,18 @@
+@@ -16471,11 +17015,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -17108,7 +17108,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16527,7 +17078,7 @@
+@@ -16529,7 +17080,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_F77='true'
        # FIXME: Should let the user specify the lib program.
@@ -17117,7 +17117,7 @@
        fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes_F77=yes
        ;;
-@@ -16560,19 +17111,18 @@
+@@ -16562,19 +17113,18 @@
        link_all_deplibs_F77=yes
      if test "$GCC" = yes ; then
      	output_verbose_link_cmd='echo'
@@ -17143,7 +17143,7 @@
            module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -16612,7 +17162,7 @@
+@@ -16614,7 +17164,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17152,7 +17152,7 @@
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -16714,7 +17264,7 @@
+@@ -16716,7 +17266,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -17161,7 +17161,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -16734,24 +17284,28 @@
+@@ -16736,24 +17286,28 @@
        ;;
  
      openbsd*)
@@ -17207,7 +17207,7 @@
        fi
        ;;
  
-@@ -16810,17 +17364,16 @@
+@@ -16812,17 +17366,16 @@
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
        *)
@@ -17234,7 +17234,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -16877,7 +17430,7 @@
+@@ -16879,7 +17432,7 @@
        fi
        ;;
  
@@ -17243,7 +17243,7 @@
        no_undefined_flag_F77='${wl}-z,text'
        archive_cmds_need_lc_F77=no
        hardcode_shlibpath_var_F77=no
-@@ -16954,7 +17507,7 @@
+@@ -16956,7 +17509,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -17252,7 +17252,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -17012,20 +17565,7 @@
+@@ -17014,20 +17567,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17274,7 +17274,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17043,7 +17583,7 @@
+@@ -17045,7 +17585,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
@@ -17283,7 +17283,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17182,12 +17722,7 @@
+@@ -17184,12 +17724,7 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -17297,7 +17297,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -17204,18 +17739,6 @@
+@@ -17206,18 +17741,6 @@
    dynamic_linker=no
    ;;
  
@@ -17316,7 +17316,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -17253,7 +17776,7 @@
+@@ -17255,7 +17778,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -17325,7 +17325,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17316,7 +17839,7 @@
+@@ -17318,7 +17841,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -17334,7 +17334,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17371,7 +17894,7 @@
+@@ -17373,7 +17896,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -17343,7 +17343,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17387,7 +17910,7 @@
+@@ -17389,7 +17912,7 @@
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -17352,7 +17352,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -17400,7 +17923,7 @@
+@@ -17402,7 +17925,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -17361,7 +17361,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17409,7 +17932,7 @@
+@@ -17411,7 +17934,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -17370,7 +17370,7 @@
    ;;
  
  netbsd*)
-@@ -17493,6 +18016,10 @@
+@@ -17495,6 +18018,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -17381,7 +17381,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17589,6 +18116,21 @@
+@@ -17591,6 +18118,21 @@
  echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
@@ -17403,7 +17403,7 @@
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
  if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -17672,6 +18214,7 @@
+@@ -17674,6 +18216,7 @@
      predeps_F77 \
      postdeps_F77 \
      compiler_lib_search_path_F77 \
@@ -17411,7 +17411,7 @@
      archive_cmds_F77 \
      archive_expsym_cmds_F77 \
      postinstall_cmds_F77 \
-@@ -17687,6 +18230,7 @@
+@@ -17689,6 +18232,7 @@
      module_cmds_F77 \
      module_expsym_cmds_F77 \
      lt_cv_prog_compiler_c_o_F77 \
@@ -17419,7 +17419,7 @@
      exclude_expsyms_F77 \
      include_expsyms_F77; do
  
-@@ -17919,6 +18463,10 @@
+@@ -17921,6 +18465,10 @@
  # shared library.
  postdeps=$lt_postdeps_F77
  
@@ -17430,7 +17430,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -18007,7 +18555,7 @@
+@@ -18009,7 +18557,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -17439,7 +17439,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_F77
-@@ -18065,10 +18613,10 @@
+@@ -18067,10 +18615,10 @@
  objext_GCJ=$objext
  
  # Code to be used in simple compile tests
@@ -17452,7 +17452,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -18084,16 +18632,16 @@
+@@ -18086,16 +18634,16 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -17472,7 +17472,7 @@
  
  
  # Allow CC to be a program name with arguments.
-@@ -18131,7 +18679,7 @@
+@@ -18133,7 +18681,7 @@
  else
    lt_cv_prog_compiler_rtti_exceptions=no
    ac_outfile=conftest.$ac_objext
@@ -17481,21 +17481,21 @@
     lt_compiler_flag="-fno-rtti -fno-exceptions"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -18142,11 +18690,11 @@
+@@ -18144,11 +18692,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18145: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18693: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18147: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18695: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18149: \$? = $ac_status" >&5
-+   echo "$as_me:18697: \$? = $ac_status" >&5
+-   echo "$as_me:18151: \$? = $ac_status" >&5
++   echo "$as_me:18699: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
-@@ -18197,14 +18745,16 @@
+@@ -18199,14 +18747,16 @@
        lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
        ;;
  
@@ -17515,7 +17515,7 @@
        ;;
  
      darwin* | rhapsody*)
-@@ -18213,7 +18763,7 @@
+@@ -18215,7 +18765,7 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -17524,7 +17524,7 @@
        # Interix 3.x gcc -fpic/-fPIC options generate broken code.
        # Instead, we relocate shared libraries at runtime.
        ;;
-@@ -18271,10 +18821,10 @@
+@@ -18273,10 +18823,10 @@
         esac
         ;;
  
@@ -17537,7 +17537,7 @@
        ;;
  
      hpux9* | hpux10* | hpux11*)
-@@ -18304,7 +18854,7 @@
+@@ -18306,7 +18856,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -17546,7 +17546,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18323,6 +18873,22 @@
+@@ -18325,6 +18875,22 @@
          # All Alpha code is PIC.
          lt_prog_compiler_static_GCJ='-non_shared'
          ;;
@@ -17569,7 +17569,7 @@
        esac
        ;;
  
-@@ -18332,6 +18898,10 @@
+@@ -18334,6 +18900,10 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -17580,7 +17580,7 @@
      solaris*)
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18394,12 +18964,12 @@
+@@ -18396,12 +18966,12 @@
  
  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
  echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
@@ -17596,17 +17596,17 @@
     lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
     # Insert the option either (1) after the last *FLAGS variable, or
     # (2) before a word containing "conftest.", or (3) at the end.
-@@ -18410,27 +18980,27 @@
+@@ -18412,27 +18982,27 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18413: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18983: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18415: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18985: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18417: \$? = $ac_status" >&5
-+   echo "$as_me:18987: \$? = $ac_status" >&5
+-   echo "$as_me:18419: \$? = $ac_status" >&5
++   echo "$as_me:18989: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings other than the usual output.
@@ -17630,7 +17630,7 @@
      case $lt_prog_compiler_pic_GCJ in
       "" | " "*) ;;
       *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18457,13 +19027,13 @@
+@@ -18459,13 +19029,13 @@
  wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
  { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -17647,7 +17647,7 @@
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
       # The linker can only warn and ignore the option if not recognized
       # So say no if there are warnings
-@@ -18473,20 +19043,20 @@
+@@ -18475,20 +19045,20 @@
         $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
         if diff conftest.exp conftest.er2 >/dev/null; then
@@ -17674,7 +17674,7 @@
      :
  else
      lt_prog_compiler_static_GCJ=
-@@ -18503,7 +19073,7 @@
+@@ -18505,7 +19075,7 @@
     mkdir conftest
     cd conftest
     mkdir out
@@ -17683,21 +17683,21 @@
  
     lt_compiler_flag="-o out/conftest2.$ac_objext"
     # Insert the option either (1) after the last *FLAGS variable, or
-@@ -18514,11 +19084,11 @@
+@@ -18516,11 +19086,11 @@
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18517: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19087: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18519: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19089: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18521: \$? = $ac_status" >&5
-+   echo "$as_me:19091: \$? = $ac_status" >&5
+-   echo "$as_me:18523: \$? = $ac_status" >&5
++   echo "$as_me:19093: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
-@@ -18598,12 +19168,13 @@
+@@ -18600,12 +19170,13 @@
    # it will be wrapped by ` (' and `)$', so one must not match beginning or
    # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
    # as well as any symbol that contains `d'.
@@ -17712,7 +17712,7 @@
    extract_expsyms_cmds=
    # Just being paranoid about ensuring that cc_basename is set.
    for cc_temp in $compiler""; do
-@@ -18662,7 +19233,7 @@
+@@ -18664,7 +19235,7 @@
  
      # See if GNU ld supports shared libraries.
      case $host_os in
@@ -17721,7 +17721,7 @@
        # On AIX/PPC, the GNU linker is very broken
        if test "$host_cpu" != ia64; then
  	ld_shlibs_GCJ=no
-@@ -18710,7 +19281,7 @@
+@@ -18712,7 +19283,7 @@
        allow_undefined_flag_GCJ=unsupported
        always_export_symbols_GCJ=no
        enable_shared_with_static_runtimes_GCJ=yes
@@ -17730,7 +17730,7 @@
  
        if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
          archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -18728,7 +19299,7 @@
+@@ -18730,7 +19301,7 @@
        fi
        ;;
  
@@ -17739,7 +17739,7 @@
        hardcode_direct_GCJ=no
        hardcode_shlibpath_var_GCJ=no
        hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18743,7 +19314,7 @@
+@@ -18745,7 +19316,7 @@
        archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -17748,7 +17748,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -18761,20 +19332,30 @@
+@@ -18763,20 +19334,30 @@
  	ifc* | ifort*)			# Intel Fortran compiler
  	  tmp_addflag=' -nofor_main' ;;
  	esac
@@ -17782,7 +17782,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -18872,7 +19453,7 @@
+@@ -18874,7 +19455,7 @@
        fi
        ;;
  
@@ -17791,7 +17791,7 @@
        if test "$host_cpu" = ia64; then
  	# On IA64, the linker does run time linking by default, so we don't
  	# have to do anything special.
-@@ -18892,7 +19473,7 @@
+@@ -18894,7 +19475,7 @@
  	# Test if we are trying to use run time linking or normal
  	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
  	# need to do runtime linking.
@@ -17800,7 +17800,7 @@
  	  for ld_flag in $LDFLAGS; do
    	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
    	    aix_use_runtimelinking=yes
-@@ -18926,7 +19507,7 @@
+@@ -18928,7 +19509,7 @@
    	   strings "$collect2name" | grep resolve_lib_name >/dev/null
  	  then
    	  # We have reworked collect2
@@ -17809,7 +17809,7 @@
  	  else
    	  # We have old collect2
    	  hardcode_direct_GCJ=unsupported
-@@ -19000,11 +19581,18 @@
+@@ -19002,11 +19583,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -17832,7 +17832,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19059,11 +19647,18 @@
+@@ -19061,11 +19649,18 @@
         } && test -s conftest$ac_exeext &&
         $as_test_x conftest$ac_exeext; then
  
@@ -17855,7 +17855,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -19117,7 +19712,7 @@
+@@ -19119,7 +19714,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds_GCJ='true'
        # FIXME: Should let the user specify the lib program.
@@ -17864,7 +17864,7 @@
        fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
        enable_shared_with_static_runtimes_GCJ=yes
        ;;
-@@ -19150,19 +19745,18 @@
+@@ -19152,19 +19747,18 @@
        link_all_deplibs_GCJ=yes
      if test "$GCC" = yes ; then
      	output_verbose_link_cmd='echo'
@@ -17890,7 +17890,7 @@
            module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
            ;;
         *)
-@@ -19202,7 +19796,7 @@
+@@ -19204,7 +19798,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -17899,7 +17899,7 @@
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -19304,7 +19898,7 @@
+@@ -19306,7 +19900,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -17908,7 +17908,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19324,24 +19918,28 @@
+@@ -19326,24 +19920,28 @@
        ;;
  
      openbsd*)
@@ -17954,7 +17954,7 @@
        fi
        ;;
  
-@@ -19400,17 +19998,16 @@
+@@ -19402,17 +20000,16 @@
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
        *)
@@ -17981,7 +17981,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19467,7 +20064,7 @@
+@@ -19469,7 +20066,7 @@
        fi
        ;;
  
@@ -17990,7 +17990,7 @@
        no_undefined_flag_GCJ='${wl}-z,text'
        archive_cmds_need_lc_GCJ=no
        hardcode_shlibpath_var_GCJ=no
-@@ -19544,7 +20141,7 @@
+@@ -19546,7 +20143,7 @@
        { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
        $rm conftest*
@@ -17999,7 +17999,7 @@
  
        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
-@@ -19602,20 +20199,7 @@
+@@ -19604,20 +20201,7 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18021,7 +18021,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19633,7 +20217,7 @@
+@@ -19635,7 +20219,7 @@
    soname_spec='${libname}${release}${shared_ext}$major'
    ;;
  
@@ -18030,7 +18030,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19772,12 +20356,7 @@
+@@ -19774,12 +20358,7 @@
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
    shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -18044,7 +18044,7 @@
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
    ;;
  
-@@ -19794,18 +20373,6 @@
+@@ -19796,18 +20375,6 @@
    dynamic_linker=no
    ;;
  
@@ -18063,7 +18063,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -19843,7 +20410,7 @@
+@@ -19845,7 +20412,7 @@
      shlibpath_overrides_runpath=no
      hardcode_into_libs=yes
      ;;
@@ -18072,7 +18072,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19906,7 +20473,7 @@
+@@ -19908,7 +20475,7 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -18081,7 +18081,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19961,7 +20528,7 @@
+@@ -19963,7 +20530,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -18090,7 +18090,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19977,7 +20544,7 @@
+@@ -19979,7 +20546,7 @@
  
    # Append ld.so.conf contents to the search path
    if test -f /etc/ld.so.conf; then
@@ -18099,7 +18099,7 @@
      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    fi
  
-@@ -19990,7 +20557,7 @@
+@@ -19992,7 +20559,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18108,7 +18108,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19999,7 +20566,7 @@
+@@ -20001,7 +20568,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -18117,7 +18117,7 @@
    ;;
  
  netbsd*)
-@@ -20083,6 +20650,10 @@
+@@ -20085,6 +20652,10 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -18128,7 +18128,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -20179,6 +20750,21 @@
+@@ -20181,6 +20752,21 @@
  echo "${ECHO_T}$dynamic_linker" >&6; }
  test "$dynamic_linker" = no && can_build_shared=no
  
@@ -18150,7 +18150,7 @@
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
  if test "$GCC" = yes; then
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -20262,6 +20848,7 @@
+@@ -20264,6 +20850,7 @@
      predeps_GCJ \
      postdeps_GCJ \
      compiler_lib_search_path_GCJ \
@@ -18158,7 +18158,7 @@
      archive_cmds_GCJ \
      archive_expsym_cmds_GCJ \
      postinstall_cmds_GCJ \
-@@ -20277,6 +20864,7 @@
+@@ -20279,6 +20866,7 @@
      module_cmds_GCJ \
      module_expsym_cmds_GCJ \
      lt_cv_prog_compiler_c_o_GCJ \
@@ -18166,7 +18166,7 @@
      exclude_expsyms_GCJ \
      include_expsyms_GCJ; do
  
-@@ -20509,6 +21097,10 @@
+@@ -20511,6 +21099,10 @@
  # shared library.
  postdeps=$lt_postdeps_GCJ
  
@@ -18177,7 +18177,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -20597,7 +21189,7 @@
+@@ -20599,7 +21191,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -18186,7 +18186,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_GCJ
-@@ -20654,7 +21246,7 @@
+@@ -20656,7 +21248,7 @@
  objext_RC=$objext
  
  # Code to be used in simple compile tests
@@ -18195,7 +18195,7 @@
  
  # Code to be used in simple link tests
  lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20673,16 +21265,16 @@
+@@ -20675,16 +21267,16 @@
  
  # save warnings/boilerplate of simple test code
  ac_outfile=conftest.$ac_objext
@@ -18215,7 +18215,7 @@
  
  
  # Allow CC to be a program name with arguments.
-@@ -20742,6 +21334,7 @@
+@@ -20744,6 +21336,7 @@
      predeps_RC \
      postdeps_RC \
      compiler_lib_search_path_RC \
@@ -18223,7 +18223,7 @@
      archive_cmds_RC \
      archive_expsym_cmds_RC \
      postinstall_cmds_RC \
-@@ -20757,6 +21350,7 @@
+@@ -20759,6 +21352,7 @@
      module_cmds_RC \
      module_expsym_cmds_RC \
      lt_cv_prog_compiler_c_o_RC \
@@ -18231,7 +18231,7 @@
      exclude_expsyms_RC \
      include_expsyms_RC; do
  
-@@ -20989,6 +21583,10 @@
+@@ -20991,6 +21585,10 @@
  # shared library.
  postdeps=$lt_postdeps_RC
  
@@ -18242,7 +18242,7 @@
  # The library search path used internally by the compiler when linking
  # a shared library.
  compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -21077,7 +21675,7 @@
+@@ -21079,7 +21677,7 @@
  sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
  # Fix the shell variable \$srcfile for the compiler.
@@ -18251,7 +18251,7 @@
  
  # Set to yes if exported symbols are required.
  always_export_symbols=$always_export_symbols_RC
-@@ -23178,10 +23776,11 @@
+@@ -23180,10 +23778,11 @@
  { echo "$as_me:$LINENO: checking for COMMON" >&5
  echo $ECHO_N "checking for COMMON... $ECHO_C" >&6; }
  
@@ -18267,7 +18267,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23191,13 +23790,15 @@
+@@ -23193,13 +23792,15 @@
  else
    pkg_failed=yes
  fi
@@ -18289,7 +18289,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23207,8 +23808,9 @@
+@@ -23209,8 +23810,9 @@
  else
    pkg_failed=yes
  fi
@@ -18301,7 +18301,7 @@
  fi
  
  
-@@ -23221,9 +23823,9 @@
+@@ -23223,9 +23825,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18313,7 +18313,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$COMMON_PKG_ERRORS" >&5
-@@ -23288,10 +23890,11 @@
+@@ -23290,10 +23892,11 @@
  { echo "$as_me:$LINENO: checking for DAEMON" >&5
  echo $ECHO_N "checking for DAEMON... $ECHO_C" >&6; }
  
@@ -18329,7 +18329,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -23301,13 +23904,15 @@
+@@ -23303,13 +23906,15 @@
  else
    pkg_failed=yes
  fi
@@ -18351,7 +18351,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -23317,8 +23922,9 @@
+@@ -23319,8 +23924,9 @@
  else
    pkg_failed=yes
  fi
@@ -18363,7 +18363,7 @@
  fi
  
  
-@@ -23331,9 +23937,9 @@
+@@ -23333,9 +23939,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18375,7 +18375,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DAEMON_PKG_ERRORS" >&5
-@@ -23398,10 +24004,11 @@
+@@ -23400,10 +24006,11 @@
  { echo "$as_me:$LINENO: checking for GUI" >&5
  echo $ECHO_N "checking for GUI... $ECHO_C" >&6; }
  
@@ -18391,7 +18391,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23411,13 +24018,15 @@
+@@ -23413,13 +24020,15 @@
  else
    pkg_failed=yes
  fi
@@ -18413,7 +18413,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23427,8 +24036,9 @@
+@@ -23429,8 +24038,9 @@
  else
    pkg_failed=yes
  fi
@@ -18425,7 +18425,7 @@
  fi
  
  
-@@ -23441,9 +24051,9 @@
+@@ -23443,9 +24053,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18437,7 +18437,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GUI_PKG_ERRORS" >&5
-@@ -23508,10 +24118,11 @@
+@@ -23510,10 +24120,11 @@
  { echo "$as_me:$LINENO: checking for GUIGLADE" >&5
  echo $ECHO_N "checking for GUIGLADE... $ECHO_C" >&6; }
  
@@ -18453,7 +18453,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23521,13 +24132,15 @@
+@@ -23523,13 +24134,15 @@
  else
    pkg_failed=yes
  fi
@@ -18475,7 +18475,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23537,8 +24150,9 @@
+@@ -23539,8 +24152,9 @@
  else
    pkg_failed=yes
  fi
@@ -18487,7 +18487,7 @@
  fi
  
  
-@@ -23551,9 +24165,9 @@
+@@ -23553,9 +24167,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18499,7 +18499,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GUIGLADE_PKG_ERRORS" >&5
-@@ -23618,10 +24232,11 @@
+@@ -23620,10 +24234,11 @@
  { echo "$as_me:$LINENO: checking for GUING" >&5
  echo $ECHO_N "checking for GUING... $ECHO_C" >&6; }
  
@@ -18515,7 +18515,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -23631,13 +24246,15 @@
+@@ -23633,13 +24248,15 @@
  else
    pkg_failed=yes
  fi
@@ -18537,7 +18537,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -23647,8 +24264,9 @@
+@@ -23649,8 +24266,9 @@
  else
    pkg_failed=yes
  fi
@@ -18549,7 +18549,7 @@
  fi
  
  
-@@ -23661,9 +24279,9 @@
+@@ -23663,9 +24281,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18561,7 +18561,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GUING_PKG_ERRORS" >&5
-@@ -23728,10 +24346,11 @@
+@@ -23730,10 +24348,11 @@
  { echo "$as_me:$LINENO: checking for GREETER" >&5
  echo $ECHO_N "checking for GREETER... $ECHO_C" >&6; }
  
@@ -18577,7 +18577,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomecanvas-2.0 >= \$LIBGNOMECANVAS_REQUIRED librsvg-2.0 >= \$LIBRSVG_REQUIRED libxml-2.0 >= \$LIBXML_REQUIRED libart-2.0 >= \$LIBART_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED libart-2.0 >= $LIBART_REQUIRED") 2>&5
    ac_status=$?
-@@ -23741,13 +24360,15 @@
+@@ -23743,13 +24362,15 @@
  else
    pkg_failed=yes
  fi
@@ -18599,7 +18599,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libgnomecanvas-2.0 >= \$LIBGNOMECANVAS_REQUIRED librsvg-2.0 >= \$LIBRSVG_REQUIRED libxml-2.0 >= \$LIBXML_REQUIRED libart-2.0 >= \$LIBART_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libgnomecanvas-2.0 >= $LIBGNOMECANVAS_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED libart-2.0 >= $LIBART_REQUIRED") 2>&5
    ac_status=$?
-@@ -23757,8 +24378,9 @@
+@@ -23759,8 +24380,9 @@
  else
    pkg_failed=yes
  fi
@@ -18611,7 +18611,7 @@
  fi
  
  
-@@ -23771,9 +24393,9 @@
+@@ -23773,9 +24395,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18623,7 +18623,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GREETER_PKG_ERRORS" >&5
-@@ -23838,10 +24460,11 @@
+@@ -23840,10 +24462,11 @@
  { echo "$as_me:$LINENO: checking for UTILS" >&5
  echo $ECHO_N "checking for UTILS... $ECHO_C" >&6; }
  
@@ -18639,7 +18639,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23851,13 +24474,15 @@
+@@ -23853,13 +24476,15 @@
  else
    pkg_failed=yes
  fi
@@ -18661,7 +18661,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED libglade-2.0 >= \$LIBGLADE_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED") 2>&5
    ac_status=$?
-@@ -23867,8 +24492,9 @@
+@@ -23869,8 +24494,9 @@
  else
    pkg_failed=yes
  fi
@@ -18673,7 +18673,7 @@
  fi
  
  
-@@ -23881,9 +24507,9 @@
+@@ -23883,9 +24509,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18685,7 +18685,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$UTILS_PKG_ERRORS" >&5
-@@ -23948,10 +24574,11 @@
+@@ -23950,10 +24576,11 @@
  { echo "$as_me:$LINENO: checking for GLIB" >&5
  echo $ECHO_N "checking for GLIB... $ECHO_C" >&6; }
  
@@ -18701,7 +18701,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5
    ac_status=$?
-@@ -23961,13 +24588,15 @@
+@@ -23963,13 +24590,15 @@
  else
    pkg_failed=yes
  fi
@@ -18723,7 +18723,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQUIRED") 2>&5
    ac_status=$?
-@@ -23977,8 +24606,9 @@
+@@ -23979,8 +24608,9 @@
  else
    pkg_failed=yes
  fi
@@ -18735,7 +18735,7 @@
  fi
  
  
-@@ -23991,9 +24621,9 @@
+@@ -23993,9 +24623,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18747,7 +18747,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GLIB_PKG_ERRORS" >&5
-@@ -24058,10 +24688,11 @@
+@@ -24060,10 +24690,11 @@
  { echo "$as_me:$LINENO: checking for GOBJECT" >&5
  echo $ECHO_N "checking for GOBJECT... $ECHO_C" >&6; }
  
@@ -18763,7 +18763,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED") 2>&5
    ac_status=$?
-@@ -24071,13 +24702,15 @@
+@@ -24073,13 +24704,15 @@
  else
    pkg_failed=yes
  fi
@@ -18785,7 +18785,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED") 2>&5
    ac_status=$?
-@@ -24087,8 +24720,9 @@
+@@ -24089,8 +24722,9 @@
  else
    pkg_failed=yes
  fi
@@ -18797,7 +18797,7 @@
  fi
  
  
-@@ -24101,9 +24735,9 @@
+@@ -24103,9 +24737,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18809,7 +18809,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GOBJECT_PKG_ERRORS" >&5
-@@ -24168,10 +24802,11 @@
+@@ -24170,10 +24804,11 @@
  { echo "$as_me:$LINENO: checking for PANGO" >&5
  echo $ECHO_N "checking for PANGO... $ECHO_C" >&6; }
  
@@ -18825,7 +18825,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED") 2>&5
    ac_status=$?
-@@ -24181,13 +24816,15 @@
+@@ -24183,13 +24818,15 @@
  else
    pkg_failed=yes
  fi
@@ -18847,7 +18847,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED") 2>&5
    ac_status=$?
-@@ -24197,8 +24834,9 @@
+@@ -24199,8 +24836,9 @@
  else
    pkg_failed=yes
  fi
@@ -18859,7 +18859,7 @@
  fi
  
  
-@@ -24211,9 +24849,9 @@
+@@ -24213,9 +24851,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18871,7 +18871,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$PANGO_PKG_ERRORS" >&5
-@@ -24278,10 +24916,11 @@
+@@ -24280,10 +24918,11 @@
  { echo "$as_me:$LINENO: checking for PANGOFT" >&5
  echo $ECHO_N "checking for PANGOFT... $ECHO_C" >&6; }
  
@@ -18887,7 +18887,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangoft2 >= \$PANGO_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "pangoft2 >= $PANGO_REQUIRED") 2>&5
    ac_status=$?
-@@ -24291,13 +24930,15 @@
+@@ -24293,13 +24932,15 @@
  else
    pkg_failed=yes
  fi
@@ -18909,7 +18909,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pangoft2 >= \$PANGO_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "pangoft2 >= $PANGO_REQUIRED") 2>&5
    ac_status=$?
-@@ -24307,8 +24948,9 @@
+@@ -24309,8 +24950,9 @@
  else
    pkg_failed=yes
  fi
@@ -18921,7 +18921,7 @@
  fi
  
  
-@@ -24321,9 +24963,9 @@
+@@ -24323,9 +24965,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18933,7 +18933,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$PANGOFT_PKG_ERRORS" >&5
-@@ -24388,10 +25030,11 @@
+@@ -24390,10 +25032,11 @@
  { echo "$as_me:$LINENO: checking for GDK" >&5
  echo $ECHO_N "checking for GDK... $ECHO_C" >&6; }
  
@@ -18949,7 +18949,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -24401,13 +25044,15 @@
+@@ -24403,13 +25046,15 @@
  else
    pkg_failed=yes
  fi
@@ -18971,7 +18971,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gdk-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -24417,8 +25062,9 @@
+@@ -24419,8 +25064,9 @@
  else
    pkg_failed=yes
  fi
@@ -18983,7 +18983,7 @@
  fi
  
  
-@@ -24431,9 +25077,9 @@
+@@ -24433,9 +25079,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -18995,7 +18995,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GDK_PKG_ERRORS" >&5
-@@ -24498,10 +25144,11 @@
+@@ -24500,10 +25146,11 @@
  { echo "$as_me:$LINENO: checking for GDKPIXBUF" >&5
  echo $ECHO_N "checking for GDKPIXBUF... $ECHO_C" >&6; }
  
@@ -19011,7 +19011,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -24511,13 +25158,15 @@
+@@ -24513,13 +25160,15 @@
  else
    pkg_failed=yes
  fi
@@ -19033,7 +19033,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 >= \$GTK_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 >= $GTK_REQUIRED") 2>&5
    ac_status=$?
-@@ -24527,8 +25176,9 @@
+@@ -24529,8 +25178,9 @@
  else
    pkg_failed=yes
  fi
@@ -19045,7 +19045,7 @@
  fi
  
  
-@@ -24541,9 +25191,9 @@
+@@ -24543,9 +25193,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -19057,7 +19057,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GDKPIXBUF_PKG_ERRORS" >&5
-@@ -24831,7 +25481,7 @@
+@@ -24833,7 +25483,7 @@
  
      fi
    fi
@@ -19066,7 +19066,7 @@
  
  
      gt_cv_have_gettext=no
-@@ -32717,10 +33367,11 @@
+@@ -32719,10 +33369,11 @@
  { echo "$as_me:$LINENO: checking for DBUS" >&5
  echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
  
@@ -19082,7 +19082,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
    ac_status=$?
-@@ -32730,13 +33381,15 @@
+@@ -32732,13 +33383,15 @@
  else
    pkg_failed=yes
  fi
@@ -19104,7 +19104,7 @@
      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQUIRED\"") >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQUIRED") 2>&5
    ac_status=$?
-@@ -32746,8 +33399,9 @@
+@@ -32748,8 +33401,9 @@
  else
    pkg_failed=yes
  fi
@@ -19116,7 +19116,7 @@
  fi
  
  
-@@ -32760,9 +33414,9 @@
+@@ -32762,9 +33416,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -19128,9 +19128,9 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DBUS_PKG_ERRORS" >&5
-@@ -33656,28 +34310,10 @@
+@@ -33664,28 +34318,10 @@
+    X_CONFIG_OPTIONS="-audit 0"
  fi
- 
  
 -# Use Xephyr if it is available.  It works better than Xnest since Xephyr
 -# supports the Xserver extensions, even if on a remote machine.
@@ -19160,7 +19160,7 @@
  
  # Set POST_PATH after doing system specific case above just in case
  # any platforms want to update the PATH for a specific OS or distro.
-@@ -35064,10 +35700,13 @@
+@@ -35088,10 +35724,13 @@
  host_cpu!$host_cpu$ac_delim
  host_vendor!$host_vendor$ac_delim
  host_os!$host_os$ac_delim
@@ -19174,7 +19174,7 @@
  CXX!$CXX$ac_delim
  CXXFLAGS!$CXXFLAGS$ac_delim
  ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -35123,9 +35762,6 @@
+@@ -35147,9 +35786,6 @@
  INSTOBJEXT!$INSTOBJEXT$ac_delim
  INTLLIBS!$INTLLIBS$ac_delim
  PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
@@ -19184,7 +19184,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35167,6 +35803,9 @@
+@@ -35191,6 +35827,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -19194,16 +19194,16 @@
  MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
  COMMON_GNOME_LIBS!$COMMON_GNOME_LIBS$ac_delim
  GDMOPEN!$GDMOPEN$ac_delim
-@@ -35245,7 +35884,7 @@
+@@ -35271,7 +35910,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -35646,21 +36285,22 @@
+@@ -35672,21 +36311,22 @@
    fi
    rm -f "$tmp/out12"
  # Compute $ac_file's index in $config_headers.
@@ -19233,7 +19233,7 @@
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -35697,7 +36337,7 @@
+@@ -35723,7 +36363,7 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # Grep'ing the whole file is not good either: AIX grep has a line
    # limit of 2048, but all sed's we know have understand at least 4000.
@@ -19242,9 +19242,9 @@
      dirpart=`$as_dirname -- "$mf" ||
  $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
  	 X"$mf" : 'X\(//\)[^/]' \| \
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/daemon/Makefile.in gdm-2.20.5/daemon/Makefile.in
---- gdm-2.20.5.old/daemon/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/daemon/Makefile.in	2008-04-08 12:13:15.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/daemon/Makefile.in gdm-2.20.6/daemon/Makefile.in
+--- gdm-2.20.6.old/daemon/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/daemon/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19338,9 +19338,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/16x16/apps/Makefile.in gdm-2.20.5/data/icons/16x16/apps/Makefile.in
---- gdm-2.20.5.old/data/icons/16x16/apps/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/data/icons/16x16/apps/Makefile.in	2008-04-08 12:13:17.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/16x16/apps/Makefile.in gdm-2.20.6/data/icons/16x16/apps/Makefile.in
+--- gdm-2.20.6.old/data/icons/16x16/apps/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/16x16/apps/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19376,9 +19376,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/16x16/Makefile.in gdm-2.20.5/data/icons/16x16/Makefile.in
---- gdm-2.20.5.old/data/icons/16x16/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/data/icons/16x16/Makefile.in	2008-04-08 12:13:16.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/16x16/Makefile.in gdm-2.20.6/data/icons/16x16/Makefile.in
+--- gdm-2.20.6.old/data/icons/16x16/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/16x16/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19452,9 +19452,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/22x22/apps/Makefile.in gdm-2.20.5/data/icons/22x22/apps/Makefile.in
---- gdm-2.20.5.old/data/icons/22x22/apps/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/data/icons/22x22/apps/Makefile.in	2008-04-08 12:13:18.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/22x22/apps/Makefile.in gdm-2.20.6/data/icons/22x22/apps/Makefile.in
+--- gdm-2.20.6.old/data/icons/22x22/apps/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/22x22/apps/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19490,9 +19490,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/22x22/Makefile.in gdm-2.20.5/data/icons/22x22/Makefile.in
---- gdm-2.20.5.old/data/icons/22x22/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/data/icons/22x22/Makefile.in	2008-04-08 12:13:17.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/22x22/Makefile.in gdm-2.20.6/data/icons/22x22/Makefile.in
+--- gdm-2.20.6.old/data/icons/22x22/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/22x22/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19566,9 +19566,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/24x24/apps/Makefile.in gdm-2.20.5/data/icons/24x24/apps/Makefile.in
---- gdm-2.20.5.old/data/icons/24x24/apps/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/24x24/apps/Makefile.in	2008-04-08 12:13:19.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/24x24/apps/Makefile.in gdm-2.20.6/data/icons/24x24/apps/Makefile.in
+--- gdm-2.20.6.old/data/icons/24x24/apps/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/24x24/apps/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19604,9 +19604,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/24x24/Makefile.in gdm-2.20.5/data/icons/24x24/Makefile.in
---- gdm-2.20.5.old/data/icons/24x24/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/24x24/Makefile.in	2008-04-08 12:13:18.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/24x24/Makefile.in gdm-2.20.6/data/icons/24x24/Makefile.in
+--- gdm-2.20.6.old/data/icons/24x24/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/24x24/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19680,9 +19680,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/32x32/apps/Makefile.in gdm-2.20.5/data/icons/32x32/apps/Makefile.in
---- gdm-2.20.5.old/data/icons/32x32/apps/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/32x32/apps/Makefile.in	2008-04-08 12:13:20.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/32x32/apps/Makefile.in gdm-2.20.6/data/icons/32x32/apps/Makefile.in
+--- gdm-2.20.6.old/data/icons/32x32/apps/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/32x32/apps/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19718,9 +19718,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/32x32/Makefile.in gdm-2.20.5/data/icons/32x32/Makefile.in
---- gdm-2.20.5.old/data/icons/32x32/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/32x32/Makefile.in	2008-04-08 12:13:19.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/32x32/Makefile.in gdm-2.20.6/data/icons/32x32/Makefile.in
+--- gdm-2.20.6.old/data/icons/32x32/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/32x32/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19794,9 +19794,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/48x48/apps/Makefile.in gdm-2.20.5/data/icons/48x48/apps/Makefile.in
---- gdm-2.20.5.old/data/icons/48x48/apps/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/48x48/apps/Makefile.in	2008-04-08 12:13:21.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/48x48/apps/Makefile.in gdm-2.20.6/data/icons/48x48/apps/Makefile.in
+--- gdm-2.20.6.old/data/icons/48x48/apps/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/data/icons/48x48/apps/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19832,9 +19832,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/48x48/Makefile.in gdm-2.20.5/data/icons/48x48/Makefile.in
---- gdm-2.20.5.old/data/icons/48x48/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/48x48/Makefile.in	2008-04-08 12:13:21.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/48x48/Makefile.in gdm-2.20.6/data/icons/48x48/Makefile.in
+--- gdm-2.20.6.old/data/icons/48x48/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/icons/48x48/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19908,9 +19908,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/Makefile.in gdm-2.20.5/data/icons/Makefile.in
---- gdm-2.20.5.old/data/icons/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/Makefile.in	2008-04-08 12:13:21.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/Makefile.in gdm-2.20.6/data/icons/Makefile.in
+--- gdm-2.20.6.old/data/icons/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/data/icons/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -19984,9 +19984,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/scalable/apps/Makefile.in gdm-2.20.5/data/icons/scalable/apps/Makefile.in
---- gdm-2.20.5.old/data/icons/scalable/apps/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/scalable/apps/Makefile.in	2008-04-08 12:13:22.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/scalable/apps/Makefile.in gdm-2.20.6/data/icons/scalable/apps/Makefile.in
+--- gdm-2.20.6.old/data/icons/scalable/apps/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/data/icons/scalable/apps/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20022,9 +20022,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/icons/scalable/Makefile.in gdm-2.20.5/data/icons/scalable/Makefile.in
---- gdm-2.20.5.old/data/icons/scalable/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/data/icons/scalable/Makefile.in	2008-04-08 12:13:22.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/icons/scalable/Makefile.in gdm-2.20.6/data/icons/scalable/Makefile.in
+--- gdm-2.20.6.old/data/icons/scalable/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/data/icons/scalable/Makefile.in	2008-05-21 12:11:32.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20098,9 +20098,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/data/Makefile.in gdm-2.20.5/data/Makefile.in
---- gdm-2.20.5.old/data/Makefile.in	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/data/Makefile.in	2008-04-08 12:13:15.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/data/Makefile.in gdm-2.20.6/data/Makefile.in
+--- gdm-2.20.6.old/data/Makefile.in	2008-05-13 02:27:20.000000000 +0200
++++ gdm-2.20.6/data/Makefile.in	2008-05-21 12:11:31.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20174,9 +20174,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/depcomp gdm-2.20.5/depcomp
---- gdm-2.20.5.old/depcomp	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/depcomp	2008-04-08 12:13:28.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/depcomp gdm-2.20.6/depcomp
+--- gdm-2.20.6.old/depcomp	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/depcomp	2008-05-21 12:11:35.000000000 +0200
 @@ -1,9 +1,9 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -20241,9 +20241,9 @@
    else
      # The sourcefile does not contain any dependencies, so just
      # store a dummy comment line, to avoid errors with the Makefile
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/docs/Makefile.in gdm-2.20.5/docs/Makefile.in
---- gdm-2.20.5.old/docs/Makefile.in	2008-04-07 22:31:32.000000000 +0200
-+++ gdm-2.20.5/docs/Makefile.in	2008-04-08 12:13:23.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/docs/Makefile.in gdm-2.20.6/docs/Makefile.in
+--- gdm-2.20.6.old/docs/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/docs/Makefile.in	2008-05-21 12:11:33.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20279,9 +20279,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/faces/Makefile.in gdm-2.20.5/gui/faces/Makefile.in
---- gdm-2.20.5.old/gui/faces/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/faces/Makefile.in	2008-04-08 12:13:25.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/faces/Makefile.in gdm-2.20.6/gui/faces/Makefile.in
+--- gdm-2.20.6.old/gui/faces/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/gui/faces/Makefile.in	2008-05-21 12:11:33.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20317,9 +20317,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/greeter/Makefile.in gdm-2.20.5/gui/greeter/Makefile.in
---- gdm-2.20.5.old/gui/greeter/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/greeter/Makefile.in	2008-04-08 12:13:25.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/greeter/Makefile.in gdm-2.20.6/gui/greeter/Makefile.in
+--- gdm-2.20.6.old/gui/greeter/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/gui/greeter/Makefile.in	2008-05-21 12:11:33.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20413,9 +20413,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/greeter/themes/circles/Makefile.in gdm-2.20.5/gui/greeter/themes/circles/Makefile.in
---- gdm-2.20.5.old/gui/greeter/themes/circles/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/greeter/themes/circles/Makefile.in	2008-04-08 12:13:26.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/greeter/themes/circles/Makefile.in gdm-2.20.6/gui/greeter/themes/circles/Makefile.in
+--- gdm-2.20.6.old/gui/greeter/themes/circles/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/gui/greeter/themes/circles/Makefile.in	2008-05-21 12:11:33.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20451,9 +20451,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/greeter/themes/happygnome/Makefile.in gdm-2.20.5/gui/greeter/themes/happygnome/Makefile.in
---- gdm-2.20.5.old/gui/greeter/themes/happygnome/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/greeter/themes/happygnome/Makefile.in	2008-04-08 12:13:26.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/greeter/themes/happygnome/Makefile.in gdm-2.20.6/gui/greeter/themes/happygnome/Makefile.in
+--- gdm-2.20.6.old/gui/greeter/themes/happygnome/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/gui/greeter/themes/happygnome/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20489,9 +20489,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/greeter/themes/happygnome-list/Makefile.in gdm-2.20.5/gui/greeter/themes/happygnome-list/Makefile.in
---- gdm-2.20.5.old/gui/greeter/themes/happygnome-list/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/greeter/themes/happygnome-list/Makefile.in	2008-04-08 12:13:26.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/greeter/themes/happygnome-list/Makefile.in gdm-2.20.6/gui/greeter/themes/happygnome-list/Makefile.in
+--- gdm-2.20.6.old/gui/greeter/themes/happygnome-list/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/gui/greeter/themes/happygnome-list/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20527,9 +20527,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/greeter/themes/Makefile.in gdm-2.20.5/gui/greeter/themes/Makefile.in
---- gdm-2.20.5.old/gui/greeter/themes/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/greeter/themes/Makefile.in	2008-04-08 12:13:25.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/greeter/themes/Makefile.in gdm-2.20.6/gui/greeter/themes/Makefile.in
+--- gdm-2.20.6.old/gui/greeter/themes/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/gui/greeter/themes/Makefile.in	2008-05-21 12:11:33.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20603,9 +20603,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/Makefile.in gdm-2.20.5/gui/Makefile.in
---- gdm-2.20.5.old/gui/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/Makefile.in	2008-04-08 12:13:24.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/Makefile.in gdm-2.20.6/gui/Makefile.in
+--- gdm-2.20.6.old/gui/Makefile.in	2008-05-13 02:27:21.000000000 +0200
++++ gdm-2.20.6/gui/Makefile.in	2008-05-21 12:11:33.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20721,9 +20721,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/gui/modules/Makefile.in gdm-2.20.5/gui/modules/Makefile.in
---- gdm-2.20.5.old/gui/modules/Makefile.in	2008-04-07 22:31:33.000000000 +0200
-+++ gdm-2.20.5/gui/modules/Makefile.in	2008-04-08 12:13:27.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/gui/modules/Makefile.in gdm-2.20.6/gui/modules/Makefile.in
+--- gdm-2.20.6.old/gui/modules/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/gui/modules/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -20828,9 +20828,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/install-sh gdm-2.20.5/install-sh
---- gdm-2.20.5.old/install-sh	2008-04-07 22:31:31.000000000 +0200
-+++ gdm-2.20.5/install-sh	2008-04-08 12:13:13.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/install-sh gdm-2.20.6/install-sh
+--- gdm-2.20.6.old/install-sh	2008-05-13 02:27:19.000000000 +0200
++++ gdm-2.20.6/install-sh	2008-05-21 12:11:30.000000000 +0200
 @@ -1,7 +1,7 @@
  #!/bin/sh
  # install - install a program, script, or datafile
@@ -21193,9 +21193,9 @@
  
      trap '' 0
    fi
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/ltmain.sh gdm-2.20.5/ltmain.sh
---- gdm-2.20.5.old/ltmain.sh	2008-04-06 04:26:12.000000000 +0200
-+++ gdm-2.20.5/ltmain.sh	2008-04-05 19:05:47.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/ltmain.sh gdm-2.20.6/ltmain.sh
+--- gdm-2.20.6.old/ltmain.sh	2008-04-22 18:06:44.000000000 +0200
++++ gdm-2.20.6/ltmain.sh	2008-04-29 23:33:55.000000000 +0200
 @@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
@@ -21213,7 +21213,7 @@
  PACKAGE=libtool
 -VERSION=1.5.22
 -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.26 Debian 1.5.26-3"
++VERSION="1.5.26 Debian 1.5.26-4"
 +TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
  
 -# See if we are running on zsh, and set the options which allow our
@@ -21853,9 +21853,9 @@
  
  All other options (arguments beginning with \`-') are ignored.
  
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/m4/intltool.m4 gdm-2.20.5/m4/intltool.m4
---- gdm-2.20.5.old/m4/intltool.m4	2008-04-07 22:31:14.000000000 +0200
-+++ gdm-2.20.5/m4/intltool.m4	2008-04-08 12:12:28.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/m4/intltool.m4 gdm-2.20.6/m4/intltool.m4
+--- gdm-2.20.6.old/m4/intltool.m4	2008-05-13 02:27:02.000000000 +0200
++++ gdm-2.20.6/m4/intltool.m4	2008-05-21 12:11:13.000000000 +0200
 @@ -96,7 +96,8 @@
  fi
  xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
@@ -21866,9 +21866,9 @@
      AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
  fi
  
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/Makefile.in gdm-2.20.5/Makefile.in
---- gdm-2.20.5.old/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/Makefile.in	2008-04-08 12:13:29.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/Makefile.in gdm-2.20.6/Makefile.in
+--- gdm-2.20.6.old/Makefile.in	2008-05-13 02:27:23.000000000 +0200
++++ gdm-2.20.6/Makefile.in	2008-05-21 12:11:35.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -21973,9 +21973,9 @@
  	distclean-tags distcleancheck distdir distuninstallcheck dvi \
  	dvi-am html html-am info info-am install install-am \
  	install-data install-data-am install-dvi install-dvi-am \
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/pixmaps/16x16/Makefile.in gdm-2.20.5/pixmaps/16x16/Makefile.in
---- gdm-2.20.5.old/pixmaps/16x16/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/pixmaps/16x16/Makefile.in	2008-04-08 12:13:27.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/pixmaps/16x16/Makefile.in gdm-2.20.6/pixmaps/16x16/Makefile.in
+--- gdm-2.20.6.old/pixmaps/16x16/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/pixmaps/16x16/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22011,9 +22011,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/pixmaps/24x24/Makefile.in gdm-2.20.5/pixmaps/24x24/Makefile.in
---- gdm-2.20.5.old/pixmaps/24x24/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/pixmaps/24x24/Makefile.in	2008-04-08 12:13:27.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/pixmaps/24x24/Makefile.in gdm-2.20.6/pixmaps/24x24/Makefile.in
+--- gdm-2.20.6.old/pixmaps/24x24/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/pixmaps/24x24/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22049,9 +22049,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/pixmaps/32x32/Makefile.in gdm-2.20.5/pixmaps/32x32/Makefile.in
---- gdm-2.20.5.old/pixmaps/32x32/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/pixmaps/32x32/Makefile.in	2008-04-08 12:13:28.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/pixmaps/32x32/Makefile.in gdm-2.20.6/pixmaps/32x32/Makefile.in
+--- gdm-2.20.6.old/pixmaps/32x32/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/pixmaps/32x32/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22087,9 +22087,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/pixmaps/48x48/Makefile.in gdm-2.20.5/pixmaps/48x48/Makefile.in
---- gdm-2.20.5.old/pixmaps/48x48/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/pixmaps/48x48/Makefile.in	2008-04-08 12:13:28.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/pixmaps/48x48/Makefile.in gdm-2.20.6/pixmaps/48x48/Makefile.in
+--- gdm-2.20.6.old/pixmaps/48x48/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/pixmaps/48x48/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22125,9 +22125,9 @@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SOUND_PROGRAM = @SOUND_PROGRAM@
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/pixmaps/Makefile.in gdm-2.20.5/pixmaps/Makefile.in
---- gdm-2.20.5.old/pixmaps/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/pixmaps/Makefile.in	2008-04-08 12:13:28.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/pixmaps/Makefile.in gdm-2.20.6/pixmaps/Makefile.in
+--- gdm-2.20.6.old/pixmaps/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/pixmaps/Makefile.in	2008-05-21 12:11:34.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.
@@ -22201,9 +22201,9 @@
  	test -z "$(CTAGS_ARGS)$$tags$$unique" \
  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
  	     $$tags $$unique
-diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.5.old/utils/Makefile.in gdm-2.20.5/utils/Makefile.in
---- gdm-2.20.5.old/utils/Makefile.in	2008-04-07 22:31:34.000000000 +0200
-+++ gdm-2.20.5/utils/Makefile.in	2008-04-08 12:13:28.000000000 +0200
+diff -x'*config.sub' -x'*config.guess' -Naur gdm-2.20.6.old/utils/Makefile.in gdm-2.20.6/utils/Makefile.in
+--- gdm-2.20.6.old/utils/Makefile.in	2008-05-13 02:27:22.000000000 +0200
++++ gdm-2.20.6/utils/Makefile.in	2008-05-21 12:11:35.000000000 +0200
 @@ -1,8 +1,8 @@
 -# Makefile.in generated by automake 1.10 from Makefile.am.
 +# Makefile.in generated by automake 1.10.1 from Makefile.am.

Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=15998&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series (original)
+++ desktop/unstable/gdm/debian/patches/series Wed May 21 10:15:29 2008
@@ -1,4 +1,3 @@
-01_crash_on_shutdown.patch
 20_xdm-stuff.patch
 35_gdm.conf.patch
 37_manpage-binaries.patch




More information about the pkg-gnome-commits mailing list