r13370 - in /desktop/unstable/gdm/debian: changelog control control.in patches/63_buf-decl.patch patches/65_french-translation-typo.patch patches/68_pam-authinfo-unavail.patch patches/70_mandatory-relibtoolize.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Sat Nov 3 21:18:55 UTC 2007
Author: slomo
Date: Sat Nov 3 21:18:55 2007
New Revision: 13370
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13370
Log:
* New upstream bugfix release:
+ It's possible to change to password input via tab again (Closes: #446962).
+ debian/control.in:
- Require libglib2.0-dev (>= 2.12.0).
+ debian/patches/70_mandatory-relibtoolize.patch:
- Updated for the new version.
Removed:
desktop/unstable/gdm/debian/patches/63_buf-decl.patch
desktop/unstable/gdm/debian/patches/65_french-translation-typo.patch
desktop/unstable/gdm/debian/patches/68_pam-authinfo-unavail.patch
Modified:
desktop/unstable/gdm/debian/changelog
desktop/unstable/gdm/debian/control
desktop/unstable/gdm/debian/control.in
desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch
Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13370&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Sat Nov 3 21:18:55 2007
@@ -1,8 +1,17 @@
-gdm (2.20.0-3) UNRELEASED; urgency=low
-
+gdm (2.20.1-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
* Document that references in 64_vt-auto-allocation-fix are wrong.
- -- Josselin Mouette <joss at debian.org> Sun, 07 Oct 2007 04:28:23 +0200
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + It's possible to change to password input via tab again (Closes: #446962).
+ + debian/control.in:
+ - Require libglib2.0-dev (>= 2.12.0).
+ + debian/patches/70_mandatory-relibtoolize.patch:
+ - Updated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Sat, 03 Nov 2007 22:04:04 +0100
gdm (2.20.0-2) unstable; urgency=high
Modified: desktop/unstable/gdm/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control?rev=13370&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control (original)
+++ desktop/unstable/gdm/debian/control Sat Nov 3 21:18:55 2007
@@ -2,10 +2,10 @@
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>
+Uploaders: Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: libpam0g-dev,
libdbus-glib-1-dev (>= 0.30),
- libglib2.0-dev (>= 2.8.0),
+ libglib2.0-dev (>= 2.12.0),
libgtk2.0-dev (>= 2.6.0),
libpango1.0-dev (>= 1.3.0),
libglade2-dev (>= 1:1.99.2),
Modified: desktop/unstable/gdm/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/control.in?rev=13370&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/control.in (original)
+++ desktop/unstable/gdm/debian/control.in Sat Nov 3 21:18:55 2007
@@ -5,7 +5,7 @@
Uploaders: @GNOME_TEAM@
Build-Depends: libpam0g-dev,
libdbus-glib-1-dev (>= 0.30),
- libglib2.0-dev (>= 2.8.0),
+ libglib2.0-dev (>= 2.12.0),
libgtk2.0-dev (>= 2.6.0),
libpango1.0-dev (>= 1.3.0),
libglade2-dev (>= 1:1.99.2),
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=13370&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch (original)
+++ desktop/unstable/gdm/debian/patches/70_mandatory-relibtoolize.patch Sat Nov 3 21:18:55 2007
@@ -7,10 +7,10 @@
automake-1.10
rm -rf autom4te.cache
-Index: gdm-2.20.0/aclocal.m4
-===================================================================
---- gdm-2.20.0.orig/aclocal.m4 2007-09-17 16:47:58.000000000 +0200
-+++ gdm-2.20.0/aclocal.m4 2007-10-06 16:48:05.805932727 +0200
+
+diff -Naur gdm-2.20.1.old/aclocal.m4 gdm-2.20.1/aclocal.m4
+--- gdm-2.20.1.old/aclocal.m4 2007-10-15 23:55:30.000000000 +0200
++++ gdm-2.20.1/aclocal.m4 2007-11-03 22:11:58.000000000 +0100
@@ -16,1907 +16,2534 @@
You have another version of autoconf. If you want to use that,
you should regenerate the build system entirely.], [63])])
@@ -847,7 +847,7 @@
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-+# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
-# _LT_AC_PROG_ECHO_BACKSLASH
@@ -6752,16 +6752,37 @@
m4_include([m4/gnome-doc-utils.m4])
m4_include([m4/intltool.m4])
-Index: gdm-2.20.0/config.guess
-===================================================================
---- gdm-2.20.0.orig/config.guess 2007-09-17 16:48:32.000000000 +0200
-+++ gdm-2.20.0/config.guess 2007-08-17 05:14:13.000000000 +0200
+diff -Naur gdm-2.20.1.old/common/Makefile.in gdm-2.20.1/common/Makefile.in
+--- gdm-2.20.1.old/common/Makefile.in 2007-10-15 23:55:43.000000000 +0200
++++ gdm-2.20.1/common/Makefile.in 2007-11-03 22:12:06.000000000 +0100
+@@ -243,6 +243,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/config/Makefile.in gdm-2.20.1/config/Makefile.in
+--- gdm-2.20.1.old/config/Makefile.in 2007-10-15 23:55:43.000000000 +0200
++++ gdm-2.20.1/config/Makefile.in 2007-11-03 22:12:06.000000000 +0100
+@@ -209,6 +209,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/config.guess gdm-2.20.1/config.guess
+--- gdm-2.20.1.old/config.guess 2007-10-15 23:55:49.000000000 +0200
++++ gdm-2.20.1/config.guess 2007-04-27 20:13:54.000000000 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
-+timestamp='2007-07-22'
++timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -6773,15 +6794,6 @@
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
-@@ -329,7 +330,7 @@
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
@@ -780,7 +781,7 @@
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
@@ -6803,7 +6815,7 @@
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
-+ x86)
++ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
@@ -6839,16 +6851,15 @@
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
-Index: gdm-2.20.0/config.sub
-===================================================================
---- gdm-2.20.0.orig/config.sub 2007-09-17 16:48:32.000000000 +0200
-+++ gdm-2.20.0/config.sub 2007-08-17 05:14:13.000000000 +0200
+diff -Naur gdm-2.20.1.old/config.sub gdm-2.20.1/config.sub
+--- gdm-2.20.1.old/config.sub 2007-10-15 23:55:49.000000000 +0200
++++ gdm-2.20.1/config.sub 2007-04-27 20:13:54.000000000 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-09-20'
-+timestamp='2007-06-28'
++timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -6876,29 +6887,7 @@
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
-@@ -475,8 +475,8 @@
- basic_machine=craynv-cray
- os=-unicosmp
- ;;
-- cr16c)
-- basic_machine=cr16c-unknown
-+ cr16)
-+ basic_machine=cr16-unknown
- os=-elf
- ;;
- crds | unos)
-@@ -683,6 +683,10 @@
- basic_machine=i386-pc
- os=-mingw32
- ;;
-+ mingw32ce)
-+ basic_machine=arm-unknown
-+ os=-mingw32ce
-+ ;;
- miniframe)
- basic_machine=m68000-convergent
- ;;
-@@ -925,6 +929,9 @@
+@@ -925,6 +925,9 @@
basic_machine=sh-hitachi
os=-hms
;;
@@ -6908,7 +6897,7 @@
sh64)
basic_machine=sh64-unknown
;;
-@@ -1219,7 +1226,7 @@
+@@ -1219,7 +1222,7 @@
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
@@ -6917,7 +6906,7 @@
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
-@@ -1414,6 +1421,9 @@
+@@ -1414,6 +1417,9 @@
m68*-cisco)
os=-aout
;;
@@ -6927,10 +6916,9 @@
mips*-cisco)
os=-elf
;;
-Index: gdm-2.20.0/configure
-===================================================================
---- gdm-2.20.0.orig/configure 2007-09-17 16:48:17.000000000 +0200
-+++ gdm-2.20.0/configure 2007-10-06 16:48:10.558203544 +0200
+diff -Naur gdm-2.20.1.old/configure gdm-2.20.1/configure
+--- gdm-2.20.1.old/configure 2007-10-15 23:55:40.000000000 +0200
++++ gdm-2.20.1/configure 2007-11-03 22:12:05.000000000 +0100
@@ -895,6 +895,7 @@
host_cpu
host_vendor
@@ -6939,7 +6927,7 @@
LN_S
ECHO
AR
-@@ -6128,12 +6129,13 @@
+@@ -6126,12 +6127,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6954,7 +6942,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6168,6 +6170,7 @@
+@@ -6166,6 +6168,7 @@
fi
SED=$lt_cv_path_SED
@@ -6962,7 +6950,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -6367,8 +6370,8 @@
+@@ -6365,8 +6368,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -6973,7 +6961,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6409,16 +6412,22 @@
+@@ -6407,16 +6410,22 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -7000,7 +6988,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -6456,7 +6465,7 @@
+@@ -6454,7 +6463,7 @@
esac
;;
@@ -7009,7 +6997,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)$'
;;
-@@ -6472,11 +6481,11 @@
+@@ -6470,11 +6479,11 @@
;;
# This must be Linux ELF.
@@ -7023,7 +7011,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
-@@ -6506,6 +6515,10 @@
+@@ -6504,6 +6513,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -7034,16 +7022,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6592,7 +6605,7 @@
+@@ -6590,7 +6603,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6595 "configure"' > conftest.$ac_ext
-+ echo '#line 6608 "configure"' > conftest.$ac_ext
+- echo '#line 6593 "configure"' > conftest.$ac_ext
++ echo '#line 6606 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6627,7 +6640,8 @@
+@@ -6625,7 +6638,8 @@
rm -rf conftest*
;;
@@ -7053,7 +7041,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -6638,6 +6652,9 @@
+@@ -6636,6 +6650,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -7063,7 +7051,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -6654,6 +6671,9 @@
+@@ -6652,6 +6669,9 @@
;;
*64-bit*)
case $host in
@@ -7073,7 +7061,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -8036,24 +8056,27 @@
+@@ -8034,24 +8054,27 @@
fi
;;
*)
@@ -7118,7 +7106,7 @@
;;
esac
-@@ -8070,6 +8093,7 @@
+@@ -8068,6 +8091,7 @@
@@ -7126,7 +7114,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; }
-@@ -8107,7 +8131,7 @@
+@@ -8105,7 +8129,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'"
;;
@@ -7135,7 +7123,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'"
-@@ -8658,7 +8682,7 @@
+@@ -8656,7 +8680,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -7144,7 +7132,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -8858,10 +8882,10 @@
+@@ -8856,10 +8880,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -7157,7 +7145,7 @@
# If no C compiler was specified, use CC.
-@@ -8876,13 +8900,13 @@
+@@ -8874,13 +8898,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -7173,7 +7161,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -8902,7 +8926,7 @@
+@@ -8900,7 +8924,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -7182,21 +7170,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.
-@@ -8913,11 +8937,11 @@
+@@ -8911,11 +8935,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:8916: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8940: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:8914: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8938: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:8920: \$? = $ac_status" >&5
-+ echo "$as_me:8944: \$? = $ac_status" >&5
+- echo "$as_me:8918: \$? = $ac_status" >&5
++ echo "$as_me:8942: \$? = $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.
-@@ -8968,13 +8992,15 @@
+@@ -8966,13 +8990,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -7214,7 +7202,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -8984,7 +9010,7 @@
+@@ -8982,7 +9008,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -7223,7 +7211,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -9042,7 +9068,7 @@
+@@ -9040,7 +9066,7 @@
esac
;;
@@ -7232,7 +7220,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'
-@@ -9075,7 +9101,7 @@
+@@ -9073,7 +9099,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -7241,7 +7229,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -9094,6 +9120,22 @@
+@@ -9092,6 +9118,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -7264,7 +7252,7 @@
esac
;;
-@@ -9103,6 +9145,10 @@
+@@ -9101,6 +9143,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -7275,7 +7263,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -9170,7 +9216,7 @@
+@@ -9168,7 +9214,7 @@
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -7284,21 +7272,21 @@
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.
-@@ -9181,11 +9227,11 @@
+@@ -9179,11 +9225,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:9184: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9230: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9182: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9228: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9188: \$? = $ac_status" >&5
-+ echo "$as_me:9234: \$? = $ac_status" >&5
+- echo "$as_me:9186: \$? = $ac_status" >&5
++ echo "$as_me:9232: \$? = $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.
-@@ -9234,7 +9280,7 @@
+@@ -9232,7 +9278,7 @@
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -7307,7 +7295,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
-@@ -9274,7 +9320,7 @@
+@@ -9272,7 +9318,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -7316,21 +7304,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -9285,11 +9331,11 @@
+@@ -9283,11 +9329,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:9288: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9334: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9286: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9332: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9292: \$? = $ac_status" >&5
-+ echo "$as_me:9338: \$? = $ac_status" >&5
+- echo "$as_me:9290: \$? = $ac_status" >&5
++ echo "$as_me:9336: \$? = $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
-@@ -9481,7 +9527,7 @@
+@@ -9479,7 +9525,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -7339,7 +7327,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'
-@@ -9499,7 +9545,7 @@
+@@ -9497,7 +9543,7 @@
fi
;;
@@ -7348,7 +7336,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -9514,7 +9560,7 @@
+@@ -9512,7 +9558,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'
;;
@@ -7357,7 +7345,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -9532,20 +9578,30 @@
+@@ -9530,20 +9576,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -7391,7 +7379,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9697,7 +9753,7 @@
+@@ -9695,7 +9751,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -7400,7 +7388,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -9771,11 +9827,18 @@
+@@ -9769,11 +9825,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7423,7 +7411,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9830,11 +9893,18 @@
+@@ -9828,11 +9891,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7446,7 +7434,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -9888,7 +9958,7 @@
+@@ -9886,7 +9956,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.
@@ -7455,7 +7443,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -9930,10 +10000,10 @@
+@@ -9928,10 +9998,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -7468,7 +7456,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}'
;;
*)
-@@ -9973,7 +10043,7 @@
+@@ -9971,7 +10041,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -7477,7 +7465,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -10075,7 +10145,7 @@
+@@ -10073,7 +10143,7 @@
link_all_deplibs=yes
;;
@@ -7486,7 +7474,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10095,24 +10165,28 @@
+@@ -10093,24 +10163,28 @@
;;
openbsd*)
@@ -7532,7 +7520,7 @@
fi
;;
-@@ -10171,17 +10245,16 @@
+@@ -10169,17 +10243,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -7559,7 +7547,7 @@
esac
link_all_deplibs=yes
;;
-@@ -10238,7 +10311,7 @@
+@@ -10236,7 +10309,7 @@
fi
;;
@@ -7568,7 +7556,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -10315,7 +10388,7 @@
+@@ -10313,7 +10386,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*
@@ -7577,7 +7565,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -10373,17 +10446,55 @@
+@@ -10371,17 +10444,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -7637,7 +7625,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -10543,12 +10654,8 @@
+@@ -10541,12 +10652,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -7652,7 +7640,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -10565,18 +10672,6 @@
+@@ -10563,18 +10670,6 @@
dynamic_linker=no
;;
@@ -7671,7 +7659,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -10614,7 +10709,7 @@
+@@ -10612,7 +10707,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -7680,7 +7668,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -10677,7 +10772,7 @@
+@@ -10675,7 +10770,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -7689,7 +7677,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10732,7 +10827,7 @@
+@@ -10730,7 +10825,7 @@
;;
# This must be Linux ELF.
@@ -7698,7 +7686,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10748,7 +10843,7 @@
+@@ -10746,7 +10841,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -7707,7 +7695,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -10761,7 +10856,7 @@
+@@ -10759,7 +10854,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -7716,7 +7704,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10770,7 +10865,7 @@
+@@ -10768,7 +10863,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -7725,7 +7713,7 @@
;;
netbsd*)
-@@ -10854,6 +10949,10 @@
+@@ -10852,6 +10947,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -7736,7 +7724,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -11007,6 +11106,7 @@
+@@ -11005,6 +11104,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -7744,25 +7732,25 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -11593,7 +11693,7 @@
+@@ -11591,7 +11691,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11596 "configure"
-+#line 11696 "configure"
+-#line 11594 "configure"
++#line 11694 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11693,7 +11793,7 @@
+@@ -11691,7 +11791,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
--#line 11696 "configure"
-+#line 11796 "configure"
+-#line 11694 "configure"
++#line 11794 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11891,6 +11991,7 @@
+@@ -11889,6 +11989,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -7770,7 +7758,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -11935,7 +12036,7 @@
+@@ -11933,7 +12034,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -7779,7 +7767,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12259,7 +12360,7 @@
+@@ -12257,7 +12358,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -7788,7 +7776,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -12428,10 +12529,10 @@
+@@ -12426,10 +12527,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -7801,7 +7789,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -12447,13 +12548,13 @@
+@@ -12445,13 +12546,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -7817,7 +7805,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -12712,7 +12813,7 @@
+@@ -12710,7 +12811,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -7826,7 +7814,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -12786,11 +12887,18 @@
+@@ -12784,11 +12885,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7849,7 +7837,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12846,11 +12954,18 @@
+@@ -12844,11 +12952,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -7872,7 +7860,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -12969,10 +13084,10 @@
+@@ -12967,10 +13082,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -7885,7 +7873,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}'
;;
*)
-@@ -13006,7 +13121,7 @@
+@@ -13004,7 +13119,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -7894,7 +7882,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -13055,9 +13170,7 @@
+@@ -13053,9 +13168,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -7905,7 +7893,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -13125,7 +13238,7 @@
+@@ -13123,7 +13236,7 @@
;;
esac
;;
@@ -7914,7 +7902,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -13165,7 +13278,7 @@
+@@ -13163,7 +13276,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -7923,7 +7911,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -13245,6 +13358,29 @@
+@@ -13243,6 +13356,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'
;;
@@ -7953,7 +7941,7 @@
esac
;;
lynxos*)
-@@ -13267,7 +13403,7 @@
+@@ -13265,7 +13401,7 @@
;;
esac
;;
@@ -7962,7 +7950,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=
-@@ -13283,16 +13419,20 @@
+@@ -13281,16 +13417,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -7992,7 +7980,7 @@
;;
osf3*)
case $cc_basename in
-@@ -13454,15 +13594,10 @@
+@@ -13452,15 +13592,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -8011,7 +7999,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -13509,6 +13644,12 @@
+@@ -13507,6 +13642,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -8024,7 +8012,7 @@
fi
;;
esac
-@@ -13700,7 +13841,7 @@
+@@ -13698,7 +13839,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -8033,7 +8021,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=
-@@ -13708,13 +13849,46 @@
+@@ -13706,13 +13847,46 @@
postdeps_CXX=
;;
@@ -8081,7 +8069,7 @@
;;
esac
;;
-@@ -13751,12 +13925,14 @@
+@@ -13749,12 +13923,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -8098,7 +8086,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -13768,7 +13944,7 @@
+@@ -13766,7 +13942,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -8107,7 +8095,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -13834,7 +14010,7 @@
+@@ -13832,7 +14008,7 @@
;;
esac
;;
@@ -8116,7 +8104,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -13877,7 +14053,7 @@
+@@ -13875,7 +14051,7 @@
;;
esac
;;
@@ -8125,7 +8113,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -13904,6 +14080,14 @@
+@@ -13902,6 +14078,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -8140,7 +8128,7 @@
;;
esac
;;
-@@ -13920,7 +14104,7 @@
+@@ -13918,7 +14102,7 @@
;;
esac
;;
@@ -8149,7 +8137,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14018,7 +14202,7 @@
+@@ -14016,7 +14200,7 @@
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -8158,21 +8146,21 @@
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.
-@@ -14029,11 +14213,11 @@
+@@ -14027,11 +14211,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:14032: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14216: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14030: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14214: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14036: \$? = $ac_status" >&5
-+ echo "$as_me:14220: \$? = $ac_status" >&5
+- echo "$as_me:14034: \$? = $ac_status" >&5
++ echo "$as_me:14218: \$? = $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.
-@@ -14082,7 +14266,7 @@
+@@ -14080,7 +14264,7 @@
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8181,7 +8169,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
-@@ -14122,7 +14306,7 @@
+@@ -14120,7 +14304,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -8190,21 +8178,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14133,11 +14317,11 @@
+@@ -14131,11 +14315,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:14136: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14320: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14134: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14318: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:14140: \$? = $ac_status" >&5
-+ echo "$as_me:14324: \$? = $ac_status" >&5
+- echo "$as_me:14138: \$? = $ac_status" >&5
++ echo "$as_me:14322: \$? = $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
-@@ -14203,7 +14387,10 @@
+@@ -14201,7 +14385,10 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -8216,7 +8204,7 @@
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -14234,7 +14421,7 @@
+@@ -14232,7 +14419,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*
@@ -8225,7 +8213,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -14292,20 +14479,7 @@
+@@ -14290,20 +14477,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8247,7 +8235,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -14462,12 +14636,7 @@
+@@ -14460,12 +14634,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -8261,7 +8249,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -14484,18 +14653,6 @@
+@@ -14482,18 +14651,6 @@
dynamic_linker=no
;;
@@ -8280,7 +8268,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -14533,7 +14690,7 @@
+@@ -14531,7 +14688,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -8289,7 +8277,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -14596,7 +14753,7 @@
+@@ -14594,7 +14751,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8298,7 +8286,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14651,7 +14808,7 @@
+@@ -14649,7 +14806,7 @@
;;
# This must be Linux ELF.
@@ -8307,7 +8295,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14667,7 +14824,7 @@
+@@ -14665,7 +14822,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -8316,7 +8304,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -14680,7 +14837,7 @@
+@@ -14678,7 +14835,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8325,7 +8313,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14689,7 +14846,7 @@
+@@ -14687,7 +14844,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -8334,7 +8322,7 @@
;;
netbsd*)
-@@ -14773,6 +14930,10 @@
+@@ -14771,6 +14928,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -8345,7 +8333,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -14967,6 +15128,7 @@
+@@ -14965,6 +15126,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -8353,7 +8341,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -15287,7 +15449,7 @@
+@@ -15285,7 +15447,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -8362,7 +8350,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -15378,10 +15540,17 @@
+@@ -15376,10 +15538,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -8382,7 +8370,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -15397,13 +15566,13 @@
+@@ -15395,13 +15564,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -8398,7 +8386,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -15490,13 +15659,15 @@
+@@ -15488,13 +15657,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -8416,7 +8404,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -15506,7 +15677,7 @@
+@@ -15504,7 +15675,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -8425,7 +8413,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -15564,7 +15735,7 @@
+@@ -15562,7 +15733,7 @@
esac
;;
@@ -8434,7 +8422,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'
-@@ -15597,7 +15768,7 @@
+@@ -15595,7 +15766,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -8443,7 +8431,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -15616,6 +15787,22 @@
+@@ -15614,6 +15785,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -8466,7 +8454,7 @@
esac
;;
-@@ -15625,6 +15812,10 @@
+@@ -15623,6 +15810,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -8477,7 +8465,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -15692,7 +15883,7 @@
+@@ -15690,7 +15881,7 @@
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -8486,21 +8474,21 @@
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.
-@@ -15703,11 +15894,11 @@
+@@ -15701,11 +15892,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:15706: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15897: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15704: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15895: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:15710: \$? = $ac_status" >&5
-+ echo "$as_me:15901: \$? = $ac_status" >&5
+- echo "$as_me:15708: \$? = $ac_status" >&5
++ echo "$as_me:15899: \$? = $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.
-@@ -15756,7 +15947,7 @@
+@@ -15754,7 +15945,7 @@
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -8509,7 +8497,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
-@@ -15796,7 +15987,7 @@
+@@ -15794,7 +15985,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -8518,21 +8506,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -15807,11 +15998,11 @@
+@@ -15805,11 +15996,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:15810: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16001: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:15808: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15999: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15814: \$? = $ac_status" >&5
-+ echo "$as_me:16005: \$? = $ac_status" >&5
+- echo "$as_me:15812: \$? = $ac_status" >&5
++ echo "$as_me:16003: \$? = $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
-@@ -16003,7 +16194,7 @@
+@@ -16001,7 +16192,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -8541,7 +8529,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'
-@@ -16021,7 +16212,7 @@
+@@ -16019,7 +16210,7 @@
fi
;;
@@ -8550,7 +8538,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -16036,7 +16227,7 @@
+@@ -16034,7 +16225,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'
;;
@@ -8559,7 +8547,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16054,20 +16245,30 @@
+@@ -16052,20 +16243,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -8593,7 +8581,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16219,7 +16420,7 @@
+@@ -16217,7 +16418,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -8602,7 +8590,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -16283,11 +16484,18 @@
+@@ -16281,11 +16482,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8625,7 +8613,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16332,11 +16540,18 @@
+@@ -16330,11 +16538,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -8648,7 +8636,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16390,7 +16605,7 @@
+@@ -16388,7 +16603,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.
@@ -8657,7 +8645,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -16432,10 +16647,10 @@
+@@ -16430,10 +16645,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -8670,7 +8658,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}'
;;
*)
-@@ -16475,7 +16690,7 @@
+@@ -16473,7 +16688,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8679,7 +8667,7 @@
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
-@@ -16577,7 +16792,7 @@
+@@ -16575,7 +16790,7 @@
link_all_deplibs_F77=yes
;;
@@ -8688,7 +8676,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
-@@ -16597,24 +16812,28 @@
+@@ -16595,24 +16810,28 @@
;;
openbsd*)
@@ -8734,7 +8722,7 @@
fi
;;
-@@ -16673,17 +16892,16 @@
+@@ -16671,17 +16890,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -8761,7 +8749,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -16740,7 +16958,7 @@
+@@ -16738,7 +16956,7 @@
fi
;;
@@ -8770,7 +8758,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -16817,7 +17035,7 @@
+@@ -16815,7 +17033,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*
@@ -8779,7 +8767,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -16875,20 +17093,7 @@
+@@ -16873,20 +17091,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -8801,7 +8789,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -17045,12 +17250,7 @@
+@@ -17043,12 +17248,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -8815,7 +8803,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -17067,18 +17267,6 @@
+@@ -17065,18 +17265,6 @@
dynamic_linker=no
;;
@@ -8834,7 +8822,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17116,7 +17304,7 @@
+@@ -17114,7 +17302,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -8843,7 +8831,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -17179,7 +17367,7 @@
+@@ -17177,7 +17365,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -8852,7 +8840,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17234,7 +17422,7 @@
+@@ -17232,7 +17420,7 @@
;;
# This must be Linux ELF.
@@ -8861,7 +8849,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17250,7 +17438,7 @@
+@@ -17248,7 +17436,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -8870,7 +8858,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -17263,7 +17451,7 @@
+@@ -17261,7 +17449,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8879,7 +8867,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17272,7 +17460,7 @@
+@@ -17270,7 +17458,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -8888,7 +8876,7 @@
;;
netbsd*)
-@@ -17356,6 +17544,10 @@
+@@ -17354,6 +17542,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -8899,7 +8887,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -17550,6 +17742,7 @@
+@@ -17548,6 +17740,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -8907,7 +8895,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -17870,7 +18063,7 @@
+@@ -17868,7 +18061,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -8916,7 +8904,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -17928,10 +18121,10 @@
+@@ -17926,10 +18119,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -8929,7 +8917,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -17947,13 +18140,13 @@
+@@ -17945,13 +18138,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -8945,7 +8933,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -17994,7 +18187,7 @@
+@@ -17992,7 +18185,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -8954,21 +8942,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.
-@@ -18005,11 +18198,11 @@
+@@ -18003,11 +18196,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:18008: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18201: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18006: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18199: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18012: \$? = $ac_status" >&5
-+ echo "$as_me:18205: \$? = $ac_status" >&5
+- echo "$as_me:18010: \$? = $ac_status" >&5
++ echo "$as_me:18203: \$? = $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.
-@@ -18060,13 +18253,15 @@
+@@ -18058,13 +18251,15 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -8986,7 +8974,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -18076,7 +18271,7 @@
+@@ -18074,7 +18269,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -8995,7 +8983,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -18134,7 +18329,7 @@
+@@ -18132,7 +18327,7 @@
esac
;;
@@ -9004,7 +8992,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_GCJ='-DDLL_EXPORT'
-@@ -18167,7 +18362,7 @@
+@@ -18165,7 +18360,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -9013,7 +9001,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18186,6 +18381,22 @@
+@@ -18184,6 +18379,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -9036,7 +9024,7 @@
esac
;;
-@@ -18195,6 +18406,10 @@
+@@ -18193,6 +18404,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -9047,7 +9035,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18262,7 +18477,7 @@
+@@ -18260,7 +18475,7 @@
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -9056,21 +9044,21 @@
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.
-@@ -18273,11 +18488,11 @@
+@@ -18271,11 +18486,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:18276: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18491: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18274: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18489: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:18280: \$? = $ac_status" >&5
-+ echo "$as_me:18495: \$? = $ac_status" >&5
+- echo "$as_me:18278: \$? = $ac_status" >&5
++ echo "$as_me:18493: \$? = $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.
-@@ -18326,7 +18541,7 @@
+@@ -18324,7 +18539,7 @@
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -9079,7 +9067,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
-@@ -18366,7 +18581,7 @@
+@@ -18364,7 +18579,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -9088,21 +9076,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -18377,11 +18592,11 @@
+@@ -18375,11 +18590,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:18380: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18595: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:18378: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:18384: \$? = $ac_status" >&5
-+ echo "$as_me:18599: \$? = $ac_status" >&5
+- echo "$as_me:18382: \$? = $ac_status" >&5
++ echo "$as_me:18597: \$? = $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
-@@ -18573,7 +18788,7 @@
+@@ -18571,7 +18786,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -9111,7 +9099,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'
-@@ -18591,7 +18806,7 @@
+@@ -18589,7 +18804,7 @@
fi
;;
@@ -9120,7 +9108,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -18606,7 +18821,7 @@
+@@ -18604,7 +18819,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'
;;
@@ -9129,7 +9117,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -18624,20 +18839,30 @@
+@@ -18622,20 +18837,30 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -9163,7 +9151,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18789,7 +19014,7 @@
+@@ -18787,7 +19012,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -9172,7 +9160,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -18863,11 +19088,18 @@
+@@ -18861,11 +19086,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -9195,7 +9183,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18922,11 +19154,18 @@
+@@ -18920,11 +19152,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -9218,7 +9206,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18980,7 +19219,7 @@
+@@ -18978,7 +19217,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.
@@ -9227,7 +9215,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -19022,10 +19261,10 @@
+@@ -19020,10 +19259,10 @@
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -9240,7 +9228,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}'
;;
*)
-@@ -19065,7 +19304,7 @@
+@@ -19063,7 +19302,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -9249,7 +9237,7 @@
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
-@@ -19167,7 +19406,7 @@
+@@ -19165,7 +19404,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -9258,7 +9246,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
-@@ -19187,24 +19426,28 @@
+@@ -19185,24 +19424,28 @@
;;
openbsd*)
@@ -9304,7 +9292,7 @@
fi
;;
-@@ -19263,17 +19506,16 @@
+@@ -19261,17 +19504,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -9331,7 +9319,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -19330,7 +19572,7 @@
+@@ -19328,7 +19570,7 @@
fi
;;
@@ -9340,7 +9328,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -19407,7 +19649,7 @@
+@@ -19405,7 +19647,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*
@@ -9349,7 +9337,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -19465,20 +19707,7 @@
+@@ -19463,20 +19705,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -9371,7 +9359,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -19635,12 +19864,7 @@
+@@ -19633,12 +19862,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -9385,7 +9373,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -19657,18 +19881,6 @@
+@@ -19655,18 +19879,6 @@
dynamic_linker=no
;;
@@ -9404,7 +9392,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -19706,7 +19918,7 @@
+@@ -19704,7 +19916,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -9413,7 +9401,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -19769,7 +19981,7 @@
+@@ -19767,7 +19979,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -9422,7 +9410,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19824,7 +20036,7 @@
+@@ -19822,7 +20034,7 @@
;;
# This must be Linux ELF.
@@ -9431,7 +9419,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19840,7 +20052,7 @@
+@@ -19838,7 +20050,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -9440,7 +9428,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -19853,7 +20065,7 @@
+@@ -19851,7 +20063,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9449,7 +9437,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19862,7 +20074,7 @@
+@@ -19860,7 +20072,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -9458,7 +9446,7 @@
;;
netbsd*)
-@@ -19946,6 +20158,10 @@
+@@ -19944,6 +20156,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -9469,7 +9457,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -20140,6 +20356,7 @@
+@@ -20138,6 +20354,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -9477,7 +9465,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -20460,7 +20677,7 @@
+@@ -20458,7 +20675,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -9486,7 +9474,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -20517,7 +20734,7 @@
+@@ -20515,7 +20732,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -9495,7 +9483,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -20536,13 +20753,13 @@
+@@ -20534,13 +20751,13 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -9511,7 +9499,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -20620,6 +20837,7 @@
+@@ -20618,6 +20835,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -9519,7 +9507,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -20940,7 +21158,7 @@
+@@ -20938,7 +21156,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -9528,7 +9516,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -23127,7 +23345,7 @@
+@@ -23125,7 +23343,7 @@
and COMMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9537,7 +9525,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23137,7 +23355,7 @@
+@@ -23135,7 +23353,7 @@
and COMMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9546,7 +9534,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23241,7 +23459,7 @@
+@@ -23239,7 +23457,7 @@
and DAEMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9555,7 +9543,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23251,7 +23469,7 @@
+@@ -23249,7 +23467,7 @@
and DAEMON_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9564,7 +9552,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23355,7 +23573,7 @@
+@@ -23353,7 +23571,7 @@
and GUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9573,7 +9561,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23365,7 +23583,7 @@
+@@ -23363,7 +23581,7 @@
and GUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9582,7 +9570,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23469,7 +23687,7 @@
+@@ -23467,7 +23685,7 @@
and GUIGLADE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9591,7 +9579,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23479,7 +23697,7 @@
+@@ -23477,7 +23695,7 @@
and GUIGLADE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9600,7 +9588,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23583,7 +23801,7 @@
+@@ -23581,7 +23799,7 @@
and GUING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9609,7 +9597,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23593,7 +23811,7 @@
+@@ -23591,7 +23809,7 @@
and GUING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9618,7 +9606,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23697,7 +23915,7 @@
+@@ -23695,7 +23913,7 @@
and GREETER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9627,7 +9615,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23707,7 +23925,7 @@
+@@ -23705,7 +23923,7 @@
and GREETER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9636,7 +9624,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23811,7 +24029,7 @@
+@@ -23809,7 +24027,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9645,7 +9633,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23821,7 +24039,7 @@
+@@ -23819,7 +24037,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9654,7 +9642,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -23925,7 +24143,7 @@
+@@ -23923,7 +24141,7 @@
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9663,7 +9651,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -23935,7 +24153,7 @@
+@@ -23933,7 +24151,7 @@
and GLIB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9672,7 +9660,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24039,7 +24257,7 @@
+@@ -24037,7 +24255,7 @@
and GOBJECT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9681,7 +9669,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24049,7 +24267,7 @@
+@@ -24047,7 +24265,7 @@
and GOBJECT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9690,7 +9678,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24153,7 +24371,7 @@
+@@ -24151,7 +24369,7 @@
and PANGO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9699,7 +9687,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24163,7 +24381,7 @@
+@@ -24161,7 +24379,7 @@
and PANGO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9708,7 +9696,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24267,7 +24485,7 @@
+@@ -24265,7 +24483,7 @@
and PANGOFT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9717,7 +9705,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24277,7 +24495,7 @@
+@@ -24275,7 +24493,7 @@
and PANGOFT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9726,7 +9714,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24381,7 +24599,7 @@
+@@ -24379,7 +24597,7 @@
and GDK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9735,7 +9723,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24391,7 +24609,7 @@
+@@ -24389,7 +24607,7 @@
and GDK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9744,7 +9732,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24495,7 +24713,7 @@
+@@ -24493,7 +24711,7 @@
and GDKPIXBUF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9753,7 +9741,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -24505,7 +24723,7 @@
+@@ -24503,7 +24721,7 @@
and GDKPIXBUF_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9762,7 +9750,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -32722,7 +32940,7 @@
+@@ -32716,7 +32934,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9771,7 +9759,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -32732,7 +32950,7 @@
+@@ -32726,7 +32944,7 @@
and DBUS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -9780,7 +9768,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -33581,28 +33799,10 @@
+@@ -33573,28 +33791,10 @@
fi
@@ -9812,7 +9800,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.
-@@ -34971,6 +35171,7 @@
+@@ -34963,6 +35163,7 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -9820,7 +9808,7 @@
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
-@@ -35036,7 +35237,6 @@
+@@ -35028,7 +35229,6 @@
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
@@ -9828,7 +9816,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -35078,6 +35278,7 @@
+@@ -35070,6 +35270,7 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -9836,19 +9824,128 @@
GDMOPEN!$GDMOPEN$ac_delim
GDMASKPASS!$GDMASKPASS$ac_delim
EXTRA_GDMASKPASS_LIBS!$EXTRA_GDMASKPASS_LIBS$ac_delim
-@@ -35156,7 +35357,7 @@
+@@ -35146,7 +35347,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` = 77; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 74; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: gdm-2.20.0/ltmain.sh
-===================================================================
---- gdm-2.20.0.orig/ltmain.sh 2007-09-13 22:41:47.000000000 +0200
-+++ gdm-2.20.0/ltmain.sh 2007-07-11 21:52:34.000000000 +0200
+diff -Naur gdm-2.20.1.old/daemon/Makefile.in gdm-2.20.1/daemon/Makefile.in
+--- gdm-2.20.1.old/daemon/Makefile.in 2007-10-15 23:55:44.000000000 +0200
++++ gdm-2.20.1/daemon/Makefile.in 2007-11-03 22:12:06.000000000 +0100
+@@ -264,6 +264,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/docs/Makefile.in gdm-2.20.1/docs/Makefile.in
+--- gdm-2.20.1.old/docs/Makefile.in 2007-10-15 23:55:44.000000000 +0200
++++ gdm-2.20.1/docs/Makefile.in 2007-11-03 22:12:07.000000000 +0100
+@@ -232,6 +232,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/faces/Makefile.in gdm-2.20.1/gui/faces/Makefile.in
+--- gdm-2.20.1.old/gui/faces/Makefile.in 2007-10-15 23:55:45.000000000 +0200
++++ gdm-2.20.1/gui/faces/Makefile.in 2007-11-03 22:12:07.000000000 +0100
+@@ -213,6 +213,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/greeter/Makefile.in gdm-2.20.1/gui/greeter/Makefile.in
+--- gdm-2.20.1.old/gui/greeter/Makefile.in 2007-10-15 23:55:45.000000000 +0200
++++ gdm-2.20.1/gui/greeter/Makefile.in 2007-11-03 22:12:07.000000000 +0100
+@@ -252,6 +252,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/greeter/themes/circles/Makefile.in gdm-2.20.1/gui/greeter/themes/circles/Makefile.in
+--- gdm-2.20.1.old/gui/greeter/themes/circles/Makefile.in 2007-10-15 23:55:46.000000000 +0200
++++ gdm-2.20.1/gui/greeter/themes/circles/Makefile.in 2007-11-03 22:12:08.000000000 +0100
+@@ -213,6 +213,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/greeter/themes/happygnome/Makefile.in gdm-2.20.1/gui/greeter/themes/happygnome/Makefile.in
+--- gdm-2.20.1.old/gui/greeter/themes/happygnome/Makefile.in 2007-10-15 23:55:46.000000000 +0200
++++ gdm-2.20.1/gui/greeter/themes/happygnome/Makefile.in 2007-11-03 22:12:08.000000000 +0100
+@@ -213,6 +213,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/greeter/themes/happygnome-list/Makefile.in gdm-2.20.1/gui/greeter/themes/happygnome-list/Makefile.in
+--- gdm-2.20.1.old/gui/greeter/themes/happygnome-list/Makefile.in 2007-10-15 23:55:46.000000000 +0200
++++ gdm-2.20.1/gui/greeter/themes/happygnome-list/Makefile.in 2007-11-03 22:12:08.000000000 +0100
+@@ -213,6 +213,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/greeter/themes/Makefile.in gdm-2.20.1/gui/greeter/themes/Makefile.in
+--- gdm-2.20.1.old/gui/greeter/themes/Makefile.in 2007-10-15 23:55:45.000000000 +0200
++++ gdm-2.20.1/gui/greeter/themes/Makefile.in 2007-11-03 22:12:07.000000000 +0100
+@@ -215,6 +215,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/Makefile.in gdm-2.20.1/gui/Makefile.in
+--- gdm-2.20.1.old/gui/Makefile.in 2007-10-15 23:55:44.000000000 +0200
++++ gdm-2.20.1/gui/Makefile.in 2007-11-03 22:12:07.000000000 +0100
+@@ -365,6 +365,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/gui/modules/Makefile.in gdm-2.20.1/gui/modules/Makefile.in
+--- gdm-2.20.1.old/gui/modules/Makefile.in 2007-10-15 23:55:46.000000000 +0200
++++ gdm-2.20.1/gui/modules/Makefile.in 2007-11-03 22:12:08.000000000 +0100
+@@ -244,6 +244,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/ltmain.sh gdm-2.20.1/ltmain.sh
+--- gdm-2.20.1.old/ltmain.sh 2007-09-18 19:40:37.000000000 +0200
++++ gdm-2.20.1/ltmain.sh 2007-08-14 19:43:36.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.
@@ -9866,7 +9963,7 @@
PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.24 Debian 1.5.24-1"
++VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
-# See if we are running on zsh, and set the options which allow our
@@ -10402,3 +10499,80 @@
All other options (arguments beginning with \`-') are ignored.
+diff -Naur gdm-2.20.1.old/Makefile.in gdm-2.20.1/Makefile.in
+--- gdm-2.20.1.old/Makefile.in 2007-10-15 23:55:49.000000000 +0200
++++ gdm-2.20.1/Makefile.in 2007-11-03 22:12:09.000000000 +0100
+@@ -230,6 +230,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/pixmaps/16x16/Makefile.in gdm-2.20.1/pixmaps/16x16/Makefile.in
+--- gdm-2.20.1.old/pixmaps/16x16/Makefile.in 2007-10-15 23:55:47.000000000 +0200
++++ gdm-2.20.1/pixmaps/16x16/Makefile.in 2007-11-03 22:12:08.000000000 +0100
+@@ -216,6 +216,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/pixmaps/24x24/Makefile.in gdm-2.20.1/pixmaps/24x24/Makefile.in
+--- gdm-2.20.1.old/pixmaps/24x24/Makefile.in 2007-10-15 23:55:47.000000000 +0200
++++ gdm-2.20.1/pixmaps/24x24/Makefile.in 2007-11-03 22:12:08.000000000 +0100
+@@ -205,6 +205,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/pixmaps/32x32/Makefile.in gdm-2.20.1/pixmaps/32x32/Makefile.in
+--- gdm-2.20.1.old/pixmaps/32x32/Makefile.in 2007-10-15 23:55:47.000000000 +0200
++++ gdm-2.20.1/pixmaps/32x32/Makefile.in 2007-11-03 22:12:09.000000000 +0100
+@@ -216,6 +216,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/pixmaps/48x48/Makefile.in gdm-2.20.1/pixmaps/48x48/Makefile.in
+--- gdm-2.20.1.old/pixmaps/48x48/Makefile.in 2007-10-15 23:55:47.000000000 +0200
++++ gdm-2.20.1/pixmaps/48x48/Makefile.in 2007-11-03 22:12:09.000000000 +0100
+@@ -216,6 +216,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/pixmaps/Makefile.in gdm-2.20.1/pixmaps/Makefile.in
+--- gdm-2.20.1.old/pixmaps/Makefile.in 2007-10-15 23:55:48.000000000 +0200
++++ gdm-2.20.1/pixmaps/Makefile.in 2007-11-03 22:12:09.000000000 +0100
+@@ -225,6 +225,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
+diff -Naur gdm-2.20.1.old/utils/Makefile.in gdm-2.20.1/utils/Makefile.in
+--- gdm-2.20.1.old/utils/Makefile.in 2007-10-15 23:55:48.000000000 +0200
++++ gdm-2.20.1/utils/Makefile.in 2007-11-03 22:12:09.000000000 +0100
+@@ -270,6 +270,7 @@
+ RANLIB = @RANLIB@
+ REBOOT_COMMAND = @REBOOT_COMMAND@
+ SBINDIR = @SBINDIR@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ SOUND_PROGRAM = @SOUND_PROGRAM@
More information about the pkg-gnome-commits
mailing list