[Pkg-mono-svn-commits] rev 3654 - in mono/trunk/debian: . patches
Mirco Bauer
meebey at alioth.debian.org
Tue Jun 17 22:02:13 UTC 2008
Author: meebey
Date: 2008-06-17 22:02:12 +0000 (Tue, 17 Jun 2008)
New Revision: 3654
Added:
mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch
mono/trunk/debian/patches/fix_softfloat_r105848.dpatch
mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch
mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch
Modified:
mono/trunk/debian/changelog
mono/trunk/debian/patches/00list
mono/trunk/debian/patches/99_autoreconf.dpatch
Log:
* Urgency set to medium as this release contains important bugfixes for
different architectures.
* debian/patches/fix_bound_checking_r98524_r98527.dpatch:
+ Fixes bound checking caused SIGSEGV on AMD64 when building XSP.
(Closes: #486652, patch taken from upstream SVN revision 98524 and 98527)
(thanks to Jo Shields <directhex at apebox.org> for investigation and
providing the dpatch)
* debian/patches/fix_softfloat_r105848.dpatch:
+ Fixed softfloat caused SIGABRT on armel when building banshee.
(Closes: #485112, patch taken from upstream SVN revision 105848)
* debian/patches/fix_stack_alignment_r105650_r105651.dpatch:
+ Fixes stack alignment, caused assertions on AMD64. (Closes: #473119)
(patch taken from upstream SVN revision 105650 and 105651)
* debian/patches/fix_xen_support_r103474_r103475.dpatch:
+ Fixes XEN support caused "4gb seg fixup" messages. (Closes: #481699)
(patch taken from upstream SVN revision 103474 and 103475)
(thanks to Andrew Deason <adeason2 at uiuc.edu> for investigation and
providing the dpatch)
* debian/patches/99_autoreconf.dpatch:
+ Updated
Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog 2008-06-16 23:24:06 UTC (rev 3653)
+++ mono/trunk/debian/changelog 2008-06-17 22:02:12 UTC (rev 3654)
@@ -1,12 +1,31 @@
-mono (1.9.1+dfsg-2) UNRELEASED; urgency=low
+mono (1.9.1+dfsg-2) unstable; urgency=medium
- * NOT RELEASED YET
+ * Urgency set to medium as this release contains important bugfixes for
+ different architectures.
* debian/control:
+ Added xdg-utils | libgnome2-0 | konqueror to suggests of mono-jit as
starting processes can make use of those if installed (to emulate
ShellExecute).
+ * debian/patches/fix_bound_checking_r98524_r98527.dpatch:
+ + Fixes bound checking caused SIGSEGV on AMD64 when building XSP.
+ (Closes: #486652, patch taken from upstream SVN revision 98524 and 98527)
+ (thanks to Jo Shields <directhex at apebox.org> for investigation and
+ providing the dpatch)
+ * debian/patches/fix_softfloat_r105848.dpatch:
+ + Fixed softfloat caused SIGABRT on armel when building banshee.
+ (Closes: #485112, patch taken from upstream SVN revision 105848)
+ * debian/patches/fix_stack_alignment_r105650_r105651.dpatch:
+ + Fixes stack alignment, caused assertions on AMD64. (Closes: #473119)
+ (patch taken from upstream SVN revision 105650 and 105651)
+ * debian/patches/fix_xen_support_r103474_r103475.dpatch:
+ + Fixes XEN support caused "4gb seg fixup" messages. (Closes: #481699)
+ (patch taken from upstream SVN revision 103474 and 103475)
+ (thanks to Andrew Deason <adeason2 at uiuc.edu> for investigation and
+ providing the dpatch)
+ * debian/patches/99_autoreconf.dpatch:
+ + Updated
- -- Mirco Bauer <meebey at debian.org> Wed, 23 Apr 2008 22:25:43 +0200
+ -- Mirco Bauer <meebey at debian.org> Tue, 17 Jun 2008 23:59:52 +0200
mono (1.9.1+dfsg-1) unstable; urgency=low
Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list 2008-06-16 23:24:06 UTC (rev 3653)
+++ mono/trunk/debian/patches/00list 2008-06-17 22:02:12 UTC (rev 3654)
@@ -8,4 +8,8 @@
method-signature-testing
dont_build_System.Web.Extensions
pass_CPPFLAGS_nicely_r98803
+fix_bound_checking_r98524_r98527
+fix_softfloat_r105848
+fix_stack_alignment_r105650_r105651
+fix_xen_support_r103474_r103475
99_autoreconf
Modified: mono/trunk/debian/patches/99_autoreconf.dpatch
===================================================================
--- mono/trunk/debian/patches/99_autoreconf.dpatch 2008-06-16 23:24:06 UTC (rev 3653)
+++ mono/trunk/debian/patches/99_autoreconf.dpatch 2008-06-17 22:02:12 UTC (rev 3654)
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad mono-1.9+dfsg~/Makefile.in mono-1.9+dfsg/Makefile.in
---- mono-1.9+dfsg~/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/Makefile.in 2008-04-15 22:28:48.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/Makefile.in mono-1.9.1+dfsg/Makefile.in
+--- mono-1.9.1+dfsg~/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/Makefile.in 2008-06-17 23:58:28.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.
@@ -124,9 +124,9 @@
# Distribute the 'mcs' tree too
-diff -urNad mono-1.9+dfsg~/aclocal.m4 mono-1.9+dfsg/aclocal.m4
---- mono-1.9+dfsg~/aclocal.m4 2008-03-11 00:37:51.000000000 +0100
-+++ mono-1.9+dfsg/aclocal.m4 2008-04-15 22:28:22.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/aclocal.m4 mono-1.9.1+dfsg/aclocal.m4
+--- mono-1.9.1+dfsg~/aclocal.m4 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/aclocal.m4 2008-06-17 23:58:14.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -156,7 +156,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -825,9 +825,9 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -urNad mono-1.9+dfsg~/configure mono-1.9+dfsg/configure
---- mono-1.9+dfsg~/configure 2008-03-11 00:37:58.000000000 +0100
-+++ mono-1.9+dfsg/configure 2008-04-15 22:28:44.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/configure mono-1.9.1+dfsg/configure
+--- mono-1.9.1+dfsg~/configure 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/configure 2008-06-17 23:58:24.000000000 +0200
@@ -884,6 +884,8 @@
ECHO
AR
@@ -837,7 +837,19 @@
DLLTOOL
AS
OBJDUMP
-@@ -2900,6 +2902,16 @@
+@@ -2839,6 +2841,11 @@
+ gc_default=boehm
+ fi
+
++# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
++# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
++CPPFLAGS_FOR_LIBGC=$CPPFLAGS
++CFLAGS_FOR_LIBGC=$CFLAGS
++
+ #
+ # These are the flags that need to be stored in the mono.pc file for
+ # compiling code that will embed Mono
+@@ -2900,6 +2907,16 @@
libgc_threads=pthreads
with_sigaltstack=no
;;
@@ -854,7 +866,7 @@
# these flags will work for all versions of -STABLE
#
*-*-*freebsd4*)
-@@ -6276,7 +6288,7 @@
+@@ -6276,7 +6293,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -863,7 +875,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -6371,7 +6383,7 @@
+@@ -6371,7 +6388,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -872,16 +884,16 @@
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
-@@ -6491,7 +6503,7 @@
+@@ -6491,7 +6508,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6494 "configure"' > conftest.$ac_ext
-+ echo '#line 6506 "configure"' > conftest.$ac_ext
++ echo '#line 6511 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6663,7 +6675,11 @@
+@@ -6663,7 +6680,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -894,7 +906,7 @@
esac
;;
esac
-@@ -8145,7 +8161,6 @@
+@@ -8145,7 +8166,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -902,7 +914,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; }
-@@ -8460,7 +8475,7 @@
+@@ -8460,7 +8480,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -911,7 +923,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -9020,6 +9035,318 @@
+@@ -9020,6 +9040,318 @@
;;
esac
@@ -1230,7 +1242,7 @@
enable_dlopen=no
enable_win32_dll=yes
-@@ -9085,7 +9412,7 @@
+@@ -9085,7 +9417,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -1239,21 +1251,21 @@
-@@ -9113,11 +9440,11 @@
+@@ -9113,11 +9445,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:9116: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9443: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9448: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9120: \$? = $ac_status" >&5
-+ echo "$as_me:9447: \$? = $ac_status" >&5
++ echo "$as_me:9452: \$? = $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.
-@@ -9387,10 +9714,10 @@
+@@ -9387,10 +9719,10 @@
{ 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; }
@@ -1266,17 +1278,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -9403,27 +9730,27 @@
+@@ -9403,27 +9735,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:9406: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9738: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9410: \$? = $ac_status" >&5
-+ echo "$as_me:9737: \$? = $ac_status" >&5
++ echo "$as_me:9742: \$? = $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.
@@ -1300,7 +1312,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -9450,10 +9777,10 @@
+@@ -9450,10 +9782,10 @@
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; }
@@ -1313,7 +1325,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -9466,20 +9793,20 @@
+@@ -9466,20 +9798,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
@@ -1340,21 +1352,21 @@
:
else
lt_prog_compiler_static=
-@@ -9507,11 +9834,11 @@
+@@ -9507,11 +9839,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:9510: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9837: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9842: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9514: \$? = $ac_status" >&5
-+ echo "$as_me:9841: \$? = $ac_status" >&5
++ echo "$as_me:9846: \$? = $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
-@@ -9591,12 +9918,13 @@
+@@ -9591,12 +9923,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'.
@@ -1369,7 +1381,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -9655,7 +9983,7 @@
+@@ -9655,7 +9988,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1378,7 +1390,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -9771,12 +10099,13 @@
+@@ -9771,12 +10104,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -1393,7 +1405,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -9874,7 +10203,7 @@
+@@ -9874,7 +10208,7 @@
fi
;;
@@ -1402,7 +1414,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.
-@@ -9894,7 +10223,7 @@
+@@ -9894,7 +10228,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.
@@ -1411,7 +1423,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -10166,11 +10495,10 @@
+@@ -10166,11 +10500,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1427,7 +1439,7 @@
else
case $cc_basename in
xlc*)
-@@ -10320,7 +10648,7 @@
+@@ -10320,7 +10653,7 @@
link_all_deplibs=yes
;;
@@ -1436,7 +1448,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -10690,7 +11018,7 @@
+@@ -10690,7 +11023,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1445,7 +1457,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -11031,6 +11359,18 @@
+@@ -11031,6 +11364,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1464,7 +1476,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -11212,6 +11552,21 @@
+@@ -11212,6 +11557,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -1486,7 +1498,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"
-@@ -11531,7 +11886,7 @@
+@@ -11531,7 +11891,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
@@ -1495,7 +1507,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -11807,7 +12162,7 @@
+@@ -11807,7 +12167,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
@@ -1504,25 +1516,25 @@
fi
-@@ -11856,7 +12211,7 @@
+@@ -11856,7 +12216,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11859 "configure"
-+#line 12214 "configure"
++#line 12219 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11956,7 +12311,7 @@
+@@ -11956,7 +12316,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11959 "configure"
-+#line 12314 "configure"
++#line 12319 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12083,7 +12438,7 @@
+@@ -12083,7 +12443,7 @@
fi
;;
@@ -1531,7 +1543,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -12139,6 +12494,7 @@
+@@ -12139,6 +12499,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -1539,7 +1551,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -12199,7 +12555,7 @@
+@@ -12199,7 +12560,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1548,7 +1560,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -12435,6 +12791,10 @@
+@@ -12435,6 +12796,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -1559,7 +1571,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -12683,6 +13043,7 @@
+@@ -12683,6 +13048,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -1567,7 +1579,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -12720,7 +13081,7 @@
+@@ -12720,7 +13086,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -1576,7 +1588,7 @@
# Allow CC to be a program name with arguments.
-@@ -12927,7 +13288,7 @@
+@@ -12927,7 +13293,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -1585,7 +1597,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.
-@@ -12940,7 +13301,7 @@
+@@ -12940,7 +13306,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.
@@ -1594,7 +1606,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -13198,51 +13559,23 @@
+@@ -13198,51 +13564,23 @@
fi
;;
darwin* | rhapsody*)
@@ -1655,7 +1667,7 @@
else
case $cc_basename in
xlc*)
-@@ -13493,7 +13826,7 @@
+@@ -13493,7 +13831,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -1664,7 +1676,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'
-@@ -13566,7 +13899,7 @@
+@@ -13566,7 +13904,7 @@
;;
esac
;;
@@ -1673,7 +1685,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=
-@@ -13900,7 +14233,6 @@
+@@ -13900,7 +14238,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -1681,7 +1693,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -14002,6 +14334,11 @@
+@@ -14002,6 +14339,11 @@
$rm -f confest.$objext
@@ -1693,7 +1705,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
-@@ -14057,7 +14394,6 @@
+@@ -14057,7 +14399,6 @@
;;
esac
@@ -1701,7 +1713,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -14133,7 +14469,7 @@
+@@ -14133,7 +14474,7 @@
esac
else
case $host_os in
@@ -1710,7 +1722,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -14229,7 +14565,7 @@
+@@ -14229,7 +14570,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -1719,7 +1731,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -14267,7 +14603,7 @@
+@@ -14267,7 +14608,7 @@
;;
esac
;;
@@ -1728,7 +1740,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14360,10 +14696,10 @@
+@@ -14360,10 +14701,10 @@
{ 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; }
@@ -1741,17 +1753,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -14376,27 +14712,27 @@
+@@ -14376,27 +14717,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:14379: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14715: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14720: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14383: \$? = $ac_status" >&5
-+ echo "$as_me:14719: \$? = $ac_status" >&5
++ echo "$as_me:14724: \$? = $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.
@@ -1775,7 +1787,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -14423,10 +14759,10 @@
+@@ -14423,10 +14764,10 @@
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; }
@@ -1788,7 +1800,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -14439,20 +14775,20 @@
+@@ -14439,20 +14780,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
@@ -1815,21 +1827,21 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -14480,11 +14816,11 @@
+@@ -14480,11 +14821,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:14483: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14819: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14824: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14487: \$? = $ac_status" >&5
-+ echo "$as_me:14823: \$? = $ac_status" >&5
++ echo "$as_me:14828: \$? = $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
-@@ -14537,7 +14873,7 @@
+@@ -14537,7 +14878,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -1838,7 +1850,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
-@@ -14552,10 +14888,14 @@
+@@ -14552,10 +14893,14 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -1853,7 +1865,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -14657,7 +14997,7 @@
+@@ -14657,7 +15002,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -1862,7 +1874,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14997,6 +15337,18 @@
+@@ -14997,6 +15342,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -1881,7 +1893,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -15178,6 +15530,21 @@
+@@ -15178,6 +15535,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -1903,7 +1915,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"
-@@ -15261,6 +15628,7 @@
+@@ -15261,6 +15633,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -1911,7 +1923,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -15509,6 +15877,10 @@
+@@ -15509,6 +15882,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -1922,7 +1934,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
-@@ -15723,7 +16095,7 @@
+@@ -15723,7 +16100,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -1931,7 +1943,7 @@
# Allow CC to be a program name with arguments.
-@@ -15761,7 +16133,7 @@
+@@ -15761,7 +16138,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1940,7 +1952,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -16026,10 +16398,10 @@
+@@ -16026,10 +16403,10 @@
{ 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; }
@@ -1953,17 +1965,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -16042,27 +16414,27 @@
+@@ -16042,27 +16419,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:16045: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16417: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16422: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16049: \$? = $ac_status" >&5
-+ echo "$as_me:16421: \$? = $ac_status" >&5
++ echo "$as_me:16426: \$? = $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.
@@ -1987,7 +1999,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -16089,10 +16461,10 @@
+@@ -16089,10 +16466,10 @@
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; }
@@ -2000,7 +2012,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -16105,20 +16477,20 @@
+@@ -16105,20 +16482,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
@@ -2027,21 +2039,21 @@
:
else
lt_prog_compiler_static_F77=
-@@ -16146,11 +16518,11 @@
+@@ -16146,11 +16523,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:16149: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16521: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16526: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16153: \$? = $ac_status" >&5
-+ echo "$as_me:16525: \$? = $ac_status" >&5
++ echo "$as_me:16530: \$? = $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
-@@ -16230,12 +16602,13 @@
+@@ -16230,12 +16607,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'.
@@ -2056,7 +2068,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -16294,7 +16667,7 @@
+@@ -16294,7 +16672,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2065,7 +2077,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -16410,12 +16783,13 @@
+@@ -16410,12 +16788,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2080,7 +2092,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -16513,7 +16887,7 @@
+@@ -16513,7 +16892,7 @@
fi
;;
@@ -2089,7 +2101,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.
-@@ -16533,7 +16907,7 @@
+@@ -16533,7 +16912,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.
@@ -2098,7 +2110,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -16785,11 +17159,10 @@
+@@ -16785,11 +17164,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2114,7 +2126,7 @@
else
case $cc_basename in
xlc*)
-@@ -16939,7 +17312,7 @@
+@@ -16939,7 +17317,7 @@
link_all_deplibs_F77=yes
;;
@@ -2123,7 +2135,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
-@@ -17258,7 +17631,7 @@
+@@ -17258,7 +17636,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2132,7 +2144,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17598,6 +17971,18 @@
+@@ -17598,6 +17976,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2151,7 +2163,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -17779,6 +18164,21 @@
+@@ -17779,6 +18169,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2173,7 +2185,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"
-@@ -17862,6 +18262,7 @@
+@@ -17862,6 +18267,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -2181,7 +2193,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -18110,6 +18511,10 @@
+@@ -18110,6 +18516,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -2192,7 +2204,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
-@@ -18284,7 +18689,7 @@
+@@ -18284,7 +18694,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -2201,21 +2213,21 @@
# Allow CC to be a program name with arguments.
-@@ -18333,11 +18738,11 @@
+@@ -18333,11 +18743,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:18336: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18741: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18746: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18340: \$? = $ac_status" >&5
-+ echo "$as_me:18745: \$? = $ac_status" >&5
++ echo "$as_me:18750: \$? = $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.
-@@ -18397,7 +18802,7 @@
+@@ -18397,7 +18807,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
@@ -2224,7 +2236,7 @@
;;
darwin* | rhapsody*)
-@@ -18467,7 +18872,7 @@
+@@ -18467,7 +18877,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -2233,7 +2245,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -18607,10 +19012,10 @@
+@@ -18607,10 +19017,10 @@
{ 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; }
@@ -2246,17 +2258,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -18623,27 +19028,27 @@
+@@ -18623,27 +19033,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:18626: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19031: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18630: \$? = $ac_status" >&5
-+ echo "$as_me:19035: \$? = $ac_status" >&5
++ echo "$as_me:19040: \$? = $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.
@@ -2280,7 +2292,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -18670,10 +19075,10 @@
+@@ -18670,10 +19080,10 @@
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; }
@@ -2293,7 +2305,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -18686,20 +19091,20 @@
+@@ -18686,20 +19096,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
@@ -2320,21 +2332,21 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -18727,11 +19132,11 @@
+@@ -18727,11 +19137,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:18730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19135: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19140: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18734: \$? = $ac_status" >&5
-+ echo "$as_me:19139: \$? = $ac_status" >&5
++ echo "$as_me:19144: \$? = $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
-@@ -18811,12 +19216,13 @@
+@@ -18811,12 +19221,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'.
@@ -2349,7 +2361,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -18875,7 +19281,7 @@
+@@ -18875,7 +19286,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -2358,7 +2370,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -18991,12 +19397,13 @@
+@@ -18991,12 +19402,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -2373,7 +2385,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19094,7 +19501,7 @@
+@@ -19094,7 +19506,7 @@
fi
;;
@@ -2382,7 +2394,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.
-@@ -19114,7 +19521,7 @@
+@@ -19114,7 +19526,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.
@@ -2391,7 +2403,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -19386,11 +19793,10 @@
+@@ -19386,11 +19798,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -2407,7 +2419,7 @@
else
case $cc_basename in
xlc*)
-@@ -19540,7 +19946,7 @@
+@@ -19540,7 +19951,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -2416,7 +2428,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
-@@ -19859,7 +20265,7 @@
+@@ -19859,7 +20270,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -2425,7 +2437,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -20199,6 +20605,18 @@
+@@ -20199,6 +20610,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -2444,7 +2456,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -20380,6 +20798,21 @@
+@@ -20380,6 +20803,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -2466,7 +2478,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"
-@@ -20463,6 +20896,7 @@
+@@ -20463,6 +20901,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -2474,7 +2486,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -20711,6 +21145,10 @@
+@@ -20711,6 +21150,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -2485,7 +2497,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
-@@ -20884,7 +21322,7 @@
+@@ -20884,7 +21327,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -2494,7 +2506,7 @@
# Allow CC to be a program name with arguments.
-@@ -20944,6 +21382,7 @@
+@@ -20944,6 +21387,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -2502,7 +2514,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -21192,6 +21631,10 @@
+@@ -21192,6 +21636,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -2513,7 +2525,24 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -24044,7 +24487,7 @@
+@@ -21380,6 +21828,8 @@
+
+
+
++DOLT
++
+ # Test whenever ld supports -version-script
+
+ # Check whether --with-gnu-ld was given.
+@@ -23687,6 +24137,7 @@
+ esac
+ fi
+ CFLAGS="$CFLAGS -g $WARN"
++CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
+
+ # Where's the 'mcs' source tree?
+ if test -d $srcdir/mcs; then
+@@ -24044,7 +24495,7 @@
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -2522,7 +2551,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
-@@ -24054,7 +24497,7 @@
+@@ -24054,7 +24505,7 @@
and BASE_DEPENDENCIES_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -2531,7 +2560,16 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -24812,14 +25255,6 @@
+@@ -24243,6 +24694,8 @@
+
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
++ # Pass it to libgc as well
++ CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
+
+ else
+ echo "$as_me: failed program was:" >&5
+@@ -24812,14 +25265,6 @@
;;
xincluded)
@@ -2546,7 +2584,7 @@
found_boehm=yes
gc_headers=yes
use_included_gc=yes
-@@ -24920,9 +25355,6 @@
+@@ -24920,9 +25365,6 @@
CPPFLAGS="$CPPFLAGS -DLARGE_CONFIG"
fi
@@ -2556,7 +2594,7 @@
if test x$use_included_gc = xyes; then
INCLUDED_LIBGC_TRUE=
INCLUDED_LIBGC_FALSE='#'
-@@ -37464,6 +37896,11 @@
+@@ -37464,6 +37906,11 @@
LIBC="libc.so.12"
INTL="libintl.so.0"
;;
@@ -2568,7 +2606,7 @@
*-*-*freebsd*)
LIBC="libc.so"
INTL="libintl.so"
-@@ -38057,6 +38494,18 @@
+@@ -38057,6 +38504,21 @@
CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
fi
@@ -2578,7 +2616,10 @@
+ # We should use a separate variable for this to avoid passing useless and
+ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+ # This should be executed late so we pick up the final version of CPPFLAGS
-+ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
++ # The problem with this approach, is that during a reconfigure, the main
++ # configure scripts gets invoked with these arguments, so we use separate
++ # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
++ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
+ subdirs="$subdirs libgc"
+
+ ;;
@@ -2587,7 +2628,7 @@
PREVIEW=yes
# Check whether --with-preview was given.
-@@ -39451,6 +39900,8 @@
+@@ -39451,6 +39913,8 @@
ECHO!$ECHO$ac_delim
AR!$AR$ac_delim
RANLIB!$RANLIB$ac_delim
@@ -2596,7 +2637,7 @@
DLLTOOL!$DLLTOOL$ac_delim
AS!$AS$ac_delim
OBJDUMP!$OBJDUMP$ac_delim
-@@ -39526,8 +39977,6 @@
+@@ -39526,8 +39990,6 @@
SPARC64_FALSE!$SPARC64_FALSE$ac_delim
X86_TRUE!$X86_TRUE$ac_delim
X86_FALSE!$X86_FALSE$ac_delim
@@ -2605,7 +2646,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -39569,6 +40018,8 @@
+@@ -39569,6 +40031,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -2614,7 +2655,7 @@
ALPHA_TRUE!$ALPHA_TRUE$ac_delim
ALPHA_FALSE!$ALPHA_FALSE$ac_delim
IA64_TRUE!$IA64_TRUE$ac_delim
-@@ -39604,7 +40055,7 @@
+@@ -39604,7 +40068,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -2623,7 +2664,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -40005,21 +40456,22 @@
+@@ -40005,21 +40469,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -2653,7 +2694,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -40056,7 +40508,7 @@
+@@ -40056,7 +40521,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.
@@ -2662,9 +2703,9 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -urNad mono-1.9+dfsg~/data/Makefile.in mono-1.9+dfsg/data/Makefile.in
---- mono-1.9+dfsg~/data/Makefile.in 2008-03-11 00:37:54.000000000 +0100
-+++ mono-1.9+dfsg/data/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/data/Makefile.in mono-1.9.1+dfsg/data/Makefile.in
+--- mono-1.9.1+dfsg~/data/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/data/Makefile.in 2008-06-17 23:58:25.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.
@@ -2730,9 +2771,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/data/net_1_1/Makefile.in mono-1.9+dfsg/data/net_1_1/Makefile.in
---- mono-1.9+dfsg~/data/net_1_1/Makefile.in 2008-03-11 00:37:54.000000000 +0100
-+++ mono-1.9+dfsg/data/net_1_1/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/data/net_1_1/Makefile.in mono-1.9.1+dfsg/data/net_1_1/Makefile.in
+--- mono-1.9.1+dfsg~/data/net_1_1/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/data/net_1_1/Makefile.in 2008-06-17 23:58:25.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.
@@ -2760,9 +2801,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/data/net_2_0/Makefile.in mono-1.9+dfsg/data/net_2_0/Makefile.in
---- mono-1.9+dfsg~/data/net_2_0/Makefile.in 2008-03-11 00:37:54.000000000 +0100
-+++ mono-1.9+dfsg/data/net_2_0/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/data/net_2_0/Makefile.in mono-1.9.1+dfsg/data/net_2_0/Makefile.in
+--- mono-1.9.1+dfsg~/data/net_2_0/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/data/net_2_0/Makefile.in 2008-06-17 23:58:25.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.
@@ -2790,9 +2831,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/docs/Makefile.in mono-1.9+dfsg/docs/Makefile.in
---- mono-1.9+dfsg~/docs/Makefile.in 2008-03-11 00:37:54.000000000 +0100
-+++ mono-1.9+dfsg/docs/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/docs/Makefile.in mono-1.9.1+dfsg/docs/Makefile.in
+--- mono-1.9.1+dfsg~/docs/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/docs/Makefile.in 2008-06-17 23:58:25.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.
@@ -2820,9 +2861,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/ikvm-native/Makefile.in mono-1.9+dfsg/ikvm-native/Makefile.in
---- mono-1.9+dfsg~/ikvm-native/Makefile.in 2008-03-11 00:37:54.000000000 +0100
-+++ mono-1.9+dfsg/ikvm-native/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/ikvm-native/Makefile.in mono-1.9.1+dfsg/ikvm-native/Makefile.in
+--- mono-1.9.1+dfsg~/ikvm-native/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/ikvm-native/Makefile.in 2008-06-17 23:58:25.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.
@@ -2919,9 +2960,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/libgc/Makefile.in mono-1.9+dfsg/libgc/Makefile.in
---- mono-1.9+dfsg~/libgc/Makefile.in 2008-03-11 00:38:01.000000000 +0100
-+++ mono-1.9+dfsg/libgc/Makefile.in 2008-04-15 22:28:43.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/libgc/Makefile.in mono-1.9.1+dfsg/libgc/Makefile.in
+--- mono-1.9.1+dfsg~/libgc/Makefile.in 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/libgc/Makefile.in 2008-06-17 23:58:23.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.
@@ -3018,9 +3059,9 @@
distclean-generic distclean-libtool distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
-diff -urNad mono-1.9+dfsg~/libgc/aclocal.m4 mono-1.9+dfsg/libgc/aclocal.m4
---- mono-1.9+dfsg~/libgc/aclocal.m4 2008-03-11 00:38:00.000000000 +0100
-+++ mono-1.9+dfsg/libgc/aclocal.m4 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/libgc/aclocal.m4 mono-1.9.1+dfsg/libgc/aclocal.m4
+--- mono-1.9.1+dfsg~/libgc/aclocal.m4 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/libgc/aclocal.m4 2008-06-17 23:58:21.000000000 +0200
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -3050,7 +3091,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -3710,9 +3751,9 @@
# This macro is traced by Automake.
AC_DEFUN([_AM_SUBST_NOTMAKE])
-diff -urNad mono-1.9+dfsg~/libgc/configure mono-1.9+dfsg/libgc/configure
---- mono-1.9+dfsg~/libgc/configure 2008-03-11 00:38:02.000000000 +0100
-+++ mono-1.9+dfsg/libgc/configure 2008-04-15 22:28:43.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/libgc/configure mono-1.9.1+dfsg/libgc/configure
+--- mono-1.9.1+dfsg~/libgc/configure 2008-04-23 21:53:57.000000000 +0200
++++ mono-1.9.1+dfsg/libgc/configure 2008-06-17 23:58:22.000000000 +0200
@@ -890,6 +890,8 @@
EGREP
LN_S
@@ -3722,8 +3763,24 @@
CPP
CXXCPP
F77
-@@ -4626,6 +4628,32 @@
+@@ -4515,6 +4517,15 @@
+ . ${srcdir}/configure.host
+
++# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono
++# configure, because of autoconf brokeness
++if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then
++ CPPFLAGS=$CPPFLAGS_FOR_LIBGC
++fi
++if test "x$CFLAGS_FOR_LIBGC" != "x"; then
++ CFLAGS=$CFLAGS_FOR_LIBGC
++fi
++
+ GC_CFLAGS=${gc_cflags}
+
+
+@@ -4626,6 +4637,32 @@
+
THREADDLLIBS="-lpthread -lrt"
;;
+ *-*-kfreebsd*-gnu)
@@ -3755,7 +3812,7 @@
*-*-freebsd4*)
{ echo "$as_me:$LINENO: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&5
echo "$as_me: WARNING: \"FreeBSD does not yet fully support threads with Boehm GC.\"" >&2;}
-@@ -5622,7 +5650,7 @@
+@@ -5622,7 +5659,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -3764,7 +3821,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5717,7 +5745,7 @@
+@@ -5717,7 +5754,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3773,16 +3830,16 @@
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
-@@ -5837,7 +5865,7 @@
+@@ -5837,7 +5874,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5840 "configure"' > conftest.$ac_ext
-+ echo '#line 5868 "configure"' > conftest.$ac_ext
++ echo '#line 5877 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -6009,7 +6037,11 @@
+@@ -6009,7 +6046,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -3795,7 +3852,7 @@
esac
;;
esac
-@@ -7139,7 +7171,6 @@
+@@ -7139,7 +7180,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -3803,7 +3860,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; }
-@@ -7454,7 +7485,7 @@
+@@ -7454,7 +7494,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -3812,7 +3869,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -8014,6 +8045,318 @@
+@@ -8014,6 +8054,318 @@
;;
esac
@@ -4131,7 +4188,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -8079,7 +8422,7 @@
+@@ -8079,7 +8431,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -4140,21 +4197,21 @@
-@@ -8107,11 +8450,11 @@
+@@ -8107,11 +8459,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:8110: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8453: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8462: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8114: \$? = $ac_status" >&5
-+ echo "$as_me:8457: \$? = $ac_status" >&5
++ echo "$as_me:8466: \$? = $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.
-@@ -8381,10 +8724,10 @@
+@@ -8381,10 +8733,10 @@
{ 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; }
@@ -4167,17 +4224,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-@@ -8397,27 +8740,27 @@
+@@ -8397,27 +8749,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:8400: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8743: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8752: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8404: \$? = $ac_status" >&5
-+ echo "$as_me:8747: \$? = $ac_status" >&5
++ echo "$as_me:8756: \$? = $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.
@@ -4201,7 +4258,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -8444,10 +8787,10 @@
+@@ -8444,10 +8796,10 @@
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; }
@@ -4214,7 +4271,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -8460,20 +8803,20 @@
+@@ -8460,20 +8812,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
@@ -4241,21 +4298,21 @@
:
else
lt_prog_compiler_static=
-@@ -8501,11 +8844,11 @@
+@@ -8501,11 +8853,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:8504: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8847: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8856: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8508: \$? = $ac_status" >&5
-+ echo "$as_me:8851: \$? = $ac_status" >&5
++ echo "$as_me:8860: \$? = $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
-@@ -8585,12 +8928,13 @@
+@@ -8585,12 +8937,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'.
@@ -4270,7 +4327,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8649,7 +8993,7 @@
+@@ -8649,7 +9002,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -4279,7 +4336,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8765,12 +9109,13 @@
+@@ -8765,12 +9118,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -4294,7 +4351,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -8868,7 +9213,7 @@
+@@ -8868,7 +9222,7 @@
fi
;;
@@ -4303,7 +4360,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.
-@@ -8888,7 +9233,7 @@
+@@ -8888,7 +9242,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.
@@ -4312,7 +4369,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -9160,11 +9505,10 @@
+@@ -9160,11 +9514,10 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -4328,7 +4385,7 @@
else
case $cc_basename in
xlc*)
-@@ -9314,7 +9658,7 @@
+@@ -9314,7 +9667,7 @@
link_all_deplibs=yes
;;
@@ -4337,7 +4394,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9684,7 +10028,7 @@
+@@ -9684,7 +10037,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4346,7 +4403,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -10025,6 +10369,18 @@
+@@ -10025,6 +10378,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4365,7 +4422,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -10206,6 +10562,21 @@
+@@ -10206,6 +10571,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -4387,7 +4444,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"
-@@ -10525,7 +10896,7 @@
+@@ -10525,7 +10905,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
@@ -4396,7 +4453,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10801,7 +11172,7 @@
+@@ -10801,7 +11181,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
@@ -4405,25 +4462,25 @@
fi
-@@ -10850,7 +11221,7 @@
+@@ -10850,7 +11230,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10853 "configure"
-+#line 11224 "configure"
++#line 11233 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10950,7 +11321,7 @@
+@@ -10950,7 +11330,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10953 "configure"
-+#line 11324 "configure"
++#line 11333 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -11077,7 +11448,7 @@
+@@ -11077,7 +11457,7 @@
fi
;;
@@ -4432,7 +4489,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -11133,6 +11504,7 @@
+@@ -11133,6 +11513,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -4440,7 +4497,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -11193,7 +11565,7 @@
+@@ -11193,7 +11574,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -4449,7 +4506,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11429,6 +11801,10 @@
+@@ -11429,6 +11810,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -4460,7 +4517,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11677,6 +12053,7 @@
+@@ -11677,6 +12062,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -4468,7 +4525,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11714,7 +12091,7 @@
+@@ -11714,7 +12100,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -4477,7 +4534,7 @@
# Allow CC to be a program name with arguments.
-@@ -11921,7 +12298,7 @@
+@@ -11921,7 +12307,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -4486,7 +4543,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.
-@@ -11934,7 +12311,7 @@
+@@ -11934,7 +12320,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.
@@ -4495,7 +4552,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -12192,51 +12569,23 @@
+@@ -12192,51 +12578,23 @@
fi
;;
darwin* | rhapsody*)
@@ -4556,7 +4613,7 @@
else
case $cc_basename in
xlc*)
-@@ -12487,7 +12836,7 @@
+@@ -12487,7 +12845,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -4565,7 +4622,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'
-@@ -12560,7 +12909,7 @@
+@@ -12560,7 +12918,7 @@
;;
esac
;;
@@ -4574,7 +4631,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=
-@@ -12894,7 +13243,6 @@
+@@ -12894,7 +13252,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -4582,7 +4639,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -12996,6 +13344,11 @@
+@@ -12996,6 +13353,11 @@
$rm -f confest.$objext
@@ -4594,7 +4651,7 @@
# PORTME: override above test on systems where it is broken
case $host_os in
interix[3-9]*)
-@@ -13051,7 +13404,6 @@
+@@ -13051,7 +13413,6 @@
;;
esac
@@ -4602,7 +4659,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -13127,7 +13479,7 @@
+@@ -13127,7 +13488,7 @@
esac
else
case $host_os in
@@ -4611,7 +4668,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -13223,7 +13575,7 @@
+@@ -13223,7 +13584,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -4620,7 +4677,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -13261,7 +13613,7 @@
+@@ -13261,7 +13622,7 @@
;;
esac
;;
@@ -4629,7 +4686,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -13354,10 +13706,10 @@
+@@ -13354,10 +13715,10 @@
{ 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; }
@@ -4642,17 +4699,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-@@ -13370,27 +13722,27 @@
+@@ -13370,27 +13731,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:13373: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13725: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13734: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13377: \$? = $ac_status" >&5
-+ echo "$as_me:13729: \$? = $ac_status" >&5
++ echo "$as_me:13738: \$? = $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.
@@ -4676,7 +4733,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -13417,10 +13769,10 @@
+@@ -13417,10 +13778,10 @@
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; }
@@ -4689,7 +4746,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -13433,20 +13785,20 @@
+@@ -13433,20 +13794,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
@@ -4716,21 +4773,21 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -13474,11 +13826,11 @@
+@@ -13474,11 +13835,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:13477: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13829: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13838: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13481: \$? = $ac_status" >&5
-+ echo "$as_me:13833: \$? = $ac_status" >&5
++ echo "$as_me:13842: \$? = $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
-@@ -13531,7 +13883,7 @@
+@@ -13531,7 +13892,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -4739,7 +4796,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
-@@ -13546,10 +13898,14 @@
+@@ -13546,10 +13907,14 @@
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
;;
@@ -4754,7 +4811,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -13651,7 +14007,7 @@
+@@ -13651,7 +14016,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4763,7 +4820,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13991,6 +14347,18 @@
+@@ -13991,6 +14356,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -4782,7 +4839,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14172,6 +14540,21 @@
+@@ -14172,6 +14549,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -4804,7 +4861,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"
-@@ -14255,6 +14638,7 @@
+@@ -14255,6 +14647,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -4812,7 +4869,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -14503,6 +14887,10 @@
+@@ -14503,6 +14896,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -4823,7 +4880,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
-@@ -14717,7 +15105,7 @@
+@@ -14717,7 +15114,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -4832,7 +4889,7 @@
# Allow CC to be a program name with arguments.
-@@ -14755,7 +15143,7 @@
+@@ -14755,7 +15152,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -4841,7 +4898,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -15020,10 +15408,10 @@
+@@ -15020,10 +15417,10 @@
{ 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; }
@@ -4854,17 +4911,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_F77"
-@@ -15036,27 +15424,27 @@
+@@ -15036,27 +15433,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:15039: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15427: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15436: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15043: \$? = $ac_status" >&5
-+ echo "$as_me:15431: \$? = $ac_status" >&5
++ echo "$as_me:15440: \$? = $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.
@@ -4888,7 +4945,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -15083,10 +15471,10 @@
+@@ -15083,10 +15480,10 @@
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; }
@@ -4901,7 +4958,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -15099,20 +15487,20 @@
+@@ -15099,20 +15496,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
@@ -4928,21 +4985,21 @@
:
else
lt_prog_compiler_static_F77=
-@@ -15140,11 +15528,11 @@
+@@ -15140,11 +15537,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:15143: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15531: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15540: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15147: \$? = $ac_status" >&5
-+ echo "$as_me:15535: \$? = $ac_status" >&5
++ echo "$as_me:15544: \$? = $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
-@@ -15224,12 +15612,13 @@
+@@ -15224,12 +15621,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'.
@@ -4957,7 +5014,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -15288,7 +15677,7 @@
+@@ -15288,7 +15686,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -4966,7 +5023,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -15404,12 +15793,13 @@
+@@ -15404,12 +15802,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -4981,7 +5038,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -15507,7 +15897,7 @@
+@@ -15507,7 +15906,7 @@
fi
;;
@@ -4990,7 +5047,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.
-@@ -15527,7 +15917,7 @@
+@@ -15527,7 +15926,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.
@@ -4999,7 +5056,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -15779,11 +16169,10 @@
+@@ -15779,11 +16178,10 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -5015,7 +5072,7 @@
else
case $cc_basename in
xlc*)
-@@ -15933,7 +16322,7 @@
+@@ -15933,7 +16331,7 @@
link_all_deplibs_F77=yes
;;
@@ -5024,7 +5081,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
-@@ -16252,7 +16641,7 @@
+@@ -16252,7 +16650,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5033,7 +5090,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16592,6 +16981,18 @@
+@@ -16592,6 +16990,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5052,7 +5109,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16773,6 +17174,21 @@
+@@ -16773,6 +17183,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5074,7 +5131,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"
-@@ -16856,6 +17272,7 @@
+@@ -16856,6 +17281,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -5082,7 +5139,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -17104,6 +17521,10 @@
+@@ -17104,6 +17530,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -5093,7 +5150,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
-@@ -17278,7 +17699,7 @@
+@@ -17278,7 +17708,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -5102,21 +5159,21 @@
# Allow CC to be a program name with arguments.
-@@ -17327,11 +17748,11 @@
+@@ -17327,11 +17757,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:17330: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17751: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17760: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17334: \$? = $ac_status" >&5
-+ echo "$as_me:17755: \$? = $ac_status" >&5
++ echo "$as_me:17764: \$? = $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.
-@@ -17391,7 +17812,7 @@
+@@ -17391,7 +17821,7 @@
# built for inclusion in a dll (and should export symbols for example).
# Although the cygwin gcc ignores -fPIC, still need this for old-style
# (--disable-auto-import) libraries
@@ -5125,7 +5182,7 @@
;;
darwin* | rhapsody*)
-@@ -17461,7 +17882,7 @@
+@@ -17461,7 +17891,7 @@
mingw* | cygwin* | pw32* | os2*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
@@ -5134,7 +5191,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -17601,10 +18022,10 @@
+@@ -17601,10 +18031,10 @@
{ 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; }
@@ -5147,17 +5204,17 @@
ac_outfile=conftest.$ac_objext
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-@@ -17617,27 +18038,27 @@
+@@ -17617,27 +18047,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:17620: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18041: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18050: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17624: \$? = $ac_status" >&5
-+ echo "$as_me:18045: \$? = $ac_status" >&5
++ echo "$as_me:18054: \$? = $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.
@@ -5181,7 +5238,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17664,10 +18085,10 @@
+@@ -17664,10 +18094,10 @@
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; }
@@ -5194,7 +5251,7 @@
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
-@@ -17680,20 +18101,20 @@
+@@ -17680,20 +18110,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
@@ -5221,21 +5278,21 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -17721,11 +18142,11 @@
+@@ -17721,11 +18151,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:17724: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18145: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18154: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17728: \$? = $ac_status" >&5
-+ echo "$as_me:18149: \$? = $ac_status" >&5
++ echo "$as_me:18158: \$? = $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
-@@ -17805,12 +18226,13 @@
+@@ -17805,12 +18235,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'.
@@ -5250,7 +5307,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17869,7 +18291,7 @@
+@@ -17869,7 +18300,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -5259,7 +5316,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -17985,12 +18407,13 @@
+@@ -17985,12 +18416,13 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
@@ -5274,7 +5331,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -18088,7 +18511,7 @@
+@@ -18088,7 +18520,7 @@
fi
;;
@@ -5283,7 +5340,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.
-@@ -18108,7 +18531,7 @@
+@@ -18108,7 +18540,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.
@@ -5292,7 +5349,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -18380,11 +18803,10 @@
+@@ -18380,11 +18812,10 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -5308,7 +5365,7 @@
else
case $cc_basename in
xlc*)
-@@ -18534,7 +18956,7 @@
+@@ -18534,7 +18965,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -5317,7 +5374,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
-@@ -18853,7 +19275,7 @@
+@@ -18853,7 +19284,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5326,7 +5383,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -19193,6 +19615,18 @@
+@@ -19193,6 +19624,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -5345,7 +5402,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19374,6 +19808,21 @@
+@@ -19374,6 +19817,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5367,7 +5424,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"
-@@ -19457,6 +19906,7 @@
+@@ -19457,6 +19915,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -5375,7 +5432,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -19705,6 +20155,10 @@
+@@ -19705,6 +20164,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -5386,7 +5443,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
-@@ -19878,7 +20332,7 @@
+@@ -19878,7 +20341,7 @@
echo "$lt_simple_link_test_code" >conftest.$ac_ext
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
@@ -5395,7 +5452,7 @@
# Allow CC to be a program name with arguments.
-@@ -19938,6 +20392,7 @@
+@@ -19938,6 +20401,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -5403,7 +5460,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -20186,6 +20641,10 @@
+@@ -20186,6 +20650,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -5414,7 +5471,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
-@@ -21694,6 +22153,8 @@
+@@ -21694,6 +22162,8 @@
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
@@ -5423,7 +5480,7 @@
CPP!$CPP$ac_delim
CXXCPP!$CXXCPP$ac_delim
F77!$F77$ac_delim
-@@ -21708,7 +22169,7 @@
+@@ -21708,7 +22178,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -5432,7 +5489,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -22030,7 +22491,7 @@
+@@ -22030,7 +22500,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.
@@ -5441,9 +5498,9 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-diff -urNad mono-1.9+dfsg~/libgc/doc/Makefile.in mono-1.9+dfsg/libgc/doc/Makefile.in
---- mono-1.9+dfsg~/libgc/doc/Makefile.in 2008-03-11 00:38:01.000000000 +0100
-+++ mono-1.9+dfsg/libgc/doc/Makefile.in 2008-04-15 22:28:43.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/libgc/doc/Makefile.in mono-1.9.1+dfsg/libgc/doc/Makefile.in
+--- mono-1.9.1+dfsg~/libgc/doc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/libgc/doc/Makefile.in 2008-06-17 23:58:23.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.
@@ -5471,9 +5528,9 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -urNad mono-1.9+dfsg~/libgc/include/Makefile.in mono-1.9+dfsg/libgc/include/Makefile.in
---- mono-1.9+dfsg~/libgc/include/Makefile.in 2008-03-11 00:38:01.000000000 +0100
-+++ mono-1.9+dfsg/libgc/include/Makefile.in 2008-04-15 22:28:43.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/libgc/include/Makefile.in mono-1.9.1+dfsg/libgc/include/Makefile.in
+--- mono-1.9.1+dfsg~/libgc/include/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/libgc/include/Makefile.in 2008-06-17 23:58:23.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.
@@ -5539,9 +5596,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/libgc/include/private/Makefile.in mono-1.9+dfsg/libgc/include/private/Makefile.in
---- mono-1.9+dfsg~/libgc/include/private/Makefile.in 2008-03-11 00:38:01.000000000 +0100
-+++ mono-1.9+dfsg/libgc/include/private/Makefile.in 2008-04-15 22:28:43.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/libgc/include/private/Makefile.in mono-1.9.1+dfsg/libgc/include/private/Makefile.in
+--- mono-1.9.1+dfsg~/libgc/include/private/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/libgc/include/private/Makefile.in 2008-06-17 23:58:23.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.
@@ -5569,9 +5626,9 @@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-diff -urNad mono-1.9+dfsg~/man/Makefile.in mono-1.9+dfsg/man/Makefile.in
---- mono-1.9+dfsg~/man/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/man/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/man/Makefile.in mono-1.9.1+dfsg/man/Makefile.in
+--- mono-1.9.1+dfsg~/man/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/man/Makefile.in 2008-06-17 23:58:25.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.
@@ -5599,9 +5656,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/Makefile.in mono-1.9+dfsg/mono/Makefile.in
---- mono-1.9+dfsg~/mono/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/Makefile.in mono-1.9.1+dfsg/mono/Makefile.in
+--- mono-1.9.1+dfsg~/mono/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/Makefile.in 2008-06-17 23:58:25.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.
@@ -5667,9 +5724,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/Makefile.in mono-1.9+dfsg/mono/arch/Makefile.in
---- mono-1.9+dfsg~/mono/arch/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/Makefile.in mono-1.9.1+dfsg/mono/arch/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/Makefile.in 2008-06-17 23:58:25.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.
@@ -5744,9 +5801,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/alpha/Makefile.in mono-1.9+dfsg/mono/arch/alpha/Makefile.in
---- mono-1.9+dfsg~/mono/arch/alpha/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/alpha/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/alpha/Makefile.in mono-1.9.1+dfsg/mono/arch/alpha/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/alpha/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/alpha/Makefile.in 2008-06-17 23:58:25.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.
@@ -5821,9 +5878,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/amd64/Makefile.in mono-1.9+dfsg/mono/arch/amd64/Makefile.in
---- mono-1.9+dfsg~/mono/arch/amd64/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/amd64/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/amd64/Makefile.in mono-1.9.1+dfsg/mono/arch/amd64/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/amd64/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/amd64/Makefile.in 2008-06-17 23:58:25.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.
@@ -5898,9 +5955,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/arm/Makefile.in mono-1.9+dfsg/mono/arch/arm/Makefile.in
---- mono-1.9+dfsg~/mono/arch/arm/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/arm/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/arm/Makefile.in mono-1.9.1+dfsg/mono/arch/arm/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/arm/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/arm/Makefile.in 2008-06-17 23:58:25.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.
@@ -5975,9 +6032,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/hppa/Makefile.in mono-1.9+dfsg/mono/arch/hppa/Makefile.in
---- mono-1.9+dfsg~/mono/arch/hppa/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/hppa/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/hppa/Makefile.in mono-1.9.1+dfsg/mono/arch/hppa/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/hppa/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/hppa/Makefile.in 2008-06-17 23:58:26.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.
@@ -6052,9 +6109,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/ia64/Makefile.in mono-1.9+dfsg/mono/arch/ia64/Makefile.in
---- mono-1.9+dfsg~/mono/arch/ia64/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/ia64/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/ia64/Makefile.in mono-1.9.1+dfsg/mono/arch/ia64/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/ia64/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/ia64/Makefile.in 2008-06-17 23:58:26.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.
@@ -6082,9 +6139,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/arch/mips/Makefile.in mono-1.9+dfsg/mono/arch/mips/Makefile.in
---- mono-1.9+dfsg~/mono/arch/mips/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/mips/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/mips/Makefile.in mono-1.9.1+dfsg/mono/arch/mips/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/mips/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/mips/Makefile.in 2008-06-17 23:58:26.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.
@@ -6159,9 +6216,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/ppc/Makefile.in mono-1.9+dfsg/mono/arch/ppc/Makefile.in
---- mono-1.9+dfsg~/mono/arch/ppc/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/ppc/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/ppc/Makefile.in mono-1.9.1+dfsg/mono/arch/ppc/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/ppc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/ppc/Makefile.in 2008-06-17 23:58:26.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.
@@ -6236,9 +6293,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/s390/Makefile.in mono-1.9+dfsg/mono/arch/s390/Makefile.in
---- mono-1.9+dfsg~/mono/arch/s390/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/s390/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/s390/Makefile.in mono-1.9.1+dfsg/mono/arch/s390/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/s390/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/s390/Makefile.in 2008-06-17 23:58:26.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.
@@ -6313,9 +6370,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/s390x/Makefile.in mono-1.9+dfsg/mono/arch/s390x/Makefile.in
---- mono-1.9+dfsg~/mono/arch/s390x/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/s390x/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/s390x/Makefile.in mono-1.9.1+dfsg/mono/arch/s390x/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/s390x/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/s390x/Makefile.in 2008-06-17 23:58:26.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.
@@ -6390,9 +6447,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/sparc/Makefile.in mono-1.9+dfsg/mono/arch/sparc/Makefile.in
---- mono-1.9+dfsg~/mono/arch/sparc/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/sparc/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/sparc/Makefile.in mono-1.9.1+dfsg/mono/arch/sparc/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/sparc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/sparc/Makefile.in 2008-06-17 23:58:26.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.
@@ -6467,9 +6524,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/arch/x86/Makefile.in mono-1.9+dfsg/mono/arch/x86/Makefile.in
---- mono-1.9+dfsg~/mono/arch/x86/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/arch/x86/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/arch/x86/Makefile.in mono-1.9.1+dfsg/mono/arch/x86/Makefile.in
+--- mono-1.9.1+dfsg~/mono/arch/x86/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/arch/x86/Makefile.in 2008-06-17 23:58:26.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.
@@ -6544,9 +6601,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/benchmark/Makefile.in mono-1.9+dfsg/mono/benchmark/Makefile.in
---- mono-1.9+dfsg~/mono/benchmark/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/benchmark/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/benchmark/Makefile.in mono-1.9.1+dfsg/mono/benchmark/Makefile.in
+--- mono-1.9.1+dfsg~/mono/benchmark/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/benchmark/Makefile.in 2008-06-17 23:58:26.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.
@@ -6574,9 +6631,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/cil/Makefile.in mono-1.9+dfsg/mono/cil/Makefile.in
---- mono-1.9+dfsg~/mono/cil/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/cil/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/cil/Makefile.in mono-1.9.1+dfsg/mono/cil/Makefile.in
+--- mono-1.9.1+dfsg~/mono/cil/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/cil/Makefile.in 2008-06-17 23:58:26.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.
@@ -6604,9 +6661,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/dis/Makefile.in mono-1.9+dfsg/mono/dis/Makefile.in
---- mono-1.9+dfsg~/mono/dis/Makefile.in 2008-03-11 00:37:55.000000000 +0100
-+++ mono-1.9+dfsg/mono/dis/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/dis/Makefile.in mono-1.9.1+dfsg/mono/dis/Makefile.in
+--- mono-1.9.1+dfsg~/mono/dis/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/dis/Makefile.in 2008-06-17 23:58:26.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.
@@ -6692,9 +6749,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/interpreter/Makefile.in mono-1.9+dfsg/mono/interpreter/Makefile.in
---- mono-1.9+dfsg~/mono/interpreter/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/interpreter/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/interpreter/Makefile.in mono-1.9.1+dfsg/mono/interpreter/Makefile.in
+--- mono-1.9.1+dfsg~/mono/interpreter/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/interpreter/Makefile.in 2008-06-17 23:58:26.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.
@@ -6802,9 +6859,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/io-layer/Makefile.in mono-1.9+dfsg/mono/io-layer/Makefile.in
---- mono-1.9+dfsg~/mono/io-layer/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/io-layer/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/io-layer/Makefile.in mono-1.9.1+dfsg/mono/io-layer/Makefile.in
+--- mono-1.9.1+dfsg~/mono/io-layer/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/io-layer/Makefile.in 2008-06-17 23:58:26.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.
@@ -6879,9 +6936,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/metadata/Makefile.in mono-1.9+dfsg/mono/metadata/Makefile.in
---- mono-1.9+dfsg~/mono/metadata/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/metadata/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/metadata/Makefile.in mono-1.9.1+dfsg/mono/metadata/Makefile.in
+--- mono-1.9.1+dfsg~/mono/metadata/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/metadata/Makefile.in 2008-06-17 23:58:26.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.
@@ -6967,9 +7024,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/mini/Makefile.in mono-1.9+dfsg/mono/mini/Makefile.in
---- mono-1.9+dfsg~/mono/mini/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/mini/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/mini/Makefile.in mono-1.9.1+dfsg/mono/mini/Makefile.in
+--- mono-1.9.1+dfsg~/mono/mini/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/mini/Makefile.in 2008-06-17 23:58:27.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.
@@ -7077,9 +7134,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/monoburg/Makefile.in mono-1.9+dfsg/mono/monoburg/Makefile.in
---- mono-1.9+dfsg~/mono/monoburg/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/monoburg/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/monoburg/Makefile.in mono-1.9.1+dfsg/mono/monoburg/Makefile.in
+--- mono-1.9.1+dfsg~/mono/monoburg/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/monoburg/Makefile.in 2008-06-17 23:58:27.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.
@@ -7107,9 +7164,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/monograph/Makefile.in mono-1.9+dfsg/mono/monograph/Makefile.in
---- mono-1.9+dfsg~/mono/monograph/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/monograph/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/monograph/Makefile.in mono-1.9.1+dfsg/mono/monograph/Makefile.in
+--- mono-1.9.1+dfsg~/mono/monograph/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/monograph/Makefile.in 2008-06-17 23:58:27.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.
@@ -7195,9 +7252,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/os/Makefile.in mono-1.9+dfsg/mono/os/Makefile.in
---- mono-1.9+dfsg~/mono/os/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/os/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/os/Makefile.in mono-1.9.1+dfsg/mono/os/Makefile.in
+--- mono-1.9.1+dfsg~/mono/os/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/os/Makefile.in 2008-06-17 23:58:27.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.
@@ -7225,9 +7282,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/profiler/Makefile.in mono-1.9+dfsg/mono/profiler/Makefile.in
---- mono-1.9+dfsg~/mono/profiler/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/profiler/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/profiler/Makefile.in mono-1.9.1+dfsg/mono/profiler/Makefile.in
+--- mono-1.9.1+dfsg~/mono/profiler/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/profiler/Makefile.in 2008-06-17 23:58:27.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.
@@ -7324,9 +7381,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/tests/Makefile.in mono-1.9+dfsg/mono/tests/Makefile.in
---- mono-1.9+dfsg~/mono/tests/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/Makefile.in mono-1.9.1+dfsg/mono/tests/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/Makefile.in 2008-06-17 23:58:27.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.
@@ -7401,9 +7458,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/tests/assemblyresolve/Makefile.in mono-1.9+dfsg/mono/tests/assemblyresolve/Makefile.in
---- mono-1.9+dfsg~/mono/tests/assemblyresolve/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/assemblyresolve/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/assemblyresolve/Makefile.in mono-1.9.1+dfsg/mono/tests/assemblyresolve/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/assemblyresolve/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/assemblyresolve/Makefile.in 2008-06-17 23:58:27.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.
@@ -7431,9 +7488,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/tests/cas/Makefile.in mono-1.9+dfsg/mono/tests/cas/Makefile.in
---- mono-1.9+dfsg~/mono/tests/cas/Makefile.in 2008-03-11 00:37:56.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/cas/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/cas/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/cas/Makefile.in 2008-06-17 23:58:27.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.
@@ -7499,9 +7556,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/mono/tests/cas/assembly/Makefile.in mono-1.9+dfsg/mono/tests/cas/assembly/Makefile.in
---- mono-1.9+dfsg~/mono/tests/cas/assembly/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/cas/assembly/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/assembly/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/assembly/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/cas/assembly/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/cas/assembly/Makefile.in 2008-06-17 23:58:27.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.
@@ -7529,9 +7586,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/tests/cas/demand/Makefile.in mono-1.9+dfsg/mono/tests/cas/demand/Makefile.in
---- mono-1.9+dfsg~/mono/tests/cas/demand/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/cas/demand/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/demand/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/demand/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/cas/demand/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/cas/demand/Makefile.in 2008-06-17 23:58:27.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.
@@ -7559,9 +7616,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/tests/cas/inheritance/Makefile.in mono-1.9+dfsg/mono/tests/cas/inheritance/Makefile.in
---- mono-1.9+dfsg~/mono/tests/cas/inheritance/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/cas/inheritance/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/inheritance/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/inheritance/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/cas/inheritance/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/cas/inheritance/Makefile.in 2008-06-17 23:58:27.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.
@@ -7589,9 +7646,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/tests/cas/linkdemand/Makefile.in mono-1.9+dfsg/mono/tests/cas/linkdemand/Makefile.in
---- mono-1.9+dfsg~/mono/tests/cas/linkdemand/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/cas/linkdemand/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/linkdemand/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/linkdemand/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/cas/linkdemand/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/cas/linkdemand/Makefile.in 2008-06-17 23:58:28.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.
@@ -7619,9 +7676,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/tests/cas/threads/Makefile.in mono-1.9+dfsg/mono/tests/cas/threads/Makefile.in
---- mono-1.9+dfsg~/mono/tests/cas/threads/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/mono/tests/cas/threads/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/tests/cas/threads/Makefile.in mono-1.9.1+dfsg/mono/tests/cas/threads/Makefile.in
+--- mono-1.9.1+dfsg~/mono/tests/cas/threads/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/tests/cas/threads/Makefile.in 2008-06-17 23:58:28.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.
@@ -7649,9 +7706,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/mono/utils/Makefile.in mono-1.9+dfsg/mono/utils/Makefile.in
---- mono-1.9+dfsg~/mono/utils/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/mono/utils/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/mono/utils/Makefile.in mono-1.9.1+dfsg/mono/utils/Makefile.in
+--- mono-1.9.1+dfsg~/mono/utils/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/mono/utils/Makefile.in 2008-06-17 23:58:28.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.
@@ -7726,9 +7783,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/msvc/Makefile.in mono-1.9+dfsg/msvc/Makefile.in
---- mono-1.9+dfsg~/msvc/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/msvc/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/msvc/Makefile.in mono-1.9.1+dfsg/msvc/Makefile.in
+--- mono-1.9.1+dfsg~/msvc/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/msvc/Makefile.in 2008-06-17 23:58:28.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.
@@ -7756,9 +7813,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/runtime/Makefile.in mono-1.9+dfsg/runtime/Makefile.in
---- mono-1.9+dfsg~/runtime/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/runtime/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/runtime/Makefile.in mono-1.9.1+dfsg/runtime/Makefile.in
+--- mono-1.9.1+dfsg~/runtime/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/runtime/Makefile.in 2008-06-17 23:58:28.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.
@@ -7786,9 +7843,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/samples/Makefile.in mono-1.9+dfsg/samples/Makefile.in
---- mono-1.9+dfsg~/samples/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/samples/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/samples/Makefile.in mono-1.9.1+dfsg/samples/Makefile.in
+--- mono-1.9.1+dfsg~/samples/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/samples/Makefile.in 2008-06-17 23:58:28.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.
@@ -7816,9 +7873,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/scripts/Makefile.in mono-1.9+dfsg/scripts/Makefile.in
---- mono-1.9+dfsg~/scripts/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/scripts/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/scripts/Makefile.in mono-1.9.1+dfsg/scripts/Makefile.in
+--- mono-1.9.1+dfsg~/scripts/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/scripts/Makefile.in 2008-06-17 23:58:28.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.
@@ -7846,9 +7903,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/support/Makefile.in mono-1.9+dfsg/support/Makefile.in
---- mono-1.9+dfsg~/support/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/support/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/support/Makefile.in mono-1.9.1+dfsg/support/Makefile.in
+--- mono-1.9.1+dfsg~/support/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/support/Makefile.in 2008-06-17 23:58:28.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.
@@ -7945,9 +8002,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/tools/Makefile.in mono-1.9+dfsg/tools/Makefile.in
---- mono-1.9+dfsg~/tools/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/tools/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/tools/Makefile.in mono-1.9.1+dfsg/tools/Makefile.in
+--- mono-1.9.1+dfsg~/tools/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/tools/Makefile.in 2008-06-17 23:58:28.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.
@@ -8013,9 +8070,9 @@
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
-diff -urNad mono-1.9+dfsg~/tools/locale-builder/Makefile.in mono-1.9+dfsg/tools/locale-builder/Makefile.in
---- mono-1.9+dfsg~/tools/locale-builder/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/tools/locale-builder/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/tools/locale-builder/Makefile.in mono-1.9.1+dfsg/tools/locale-builder/Makefile.in
+--- mono-1.9.1+dfsg~/tools/locale-builder/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/tools/locale-builder/Makefile.in 2008-06-17 23:58:28.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.
@@ -8043,9 +8100,9 @@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
-diff -urNad mono-1.9+dfsg~/web/Makefile.in mono-1.9+dfsg/web/Makefile.in
---- mono-1.9+dfsg~/web/Makefile.in 2008-03-11 00:37:57.000000000 +0100
-+++ mono-1.9+dfsg/web/Makefile.in 2008-04-15 22:28:23.000000000 +0200
+diff -urNad mono-1.9.1+dfsg~/web/Makefile.in mono-1.9.1+dfsg/web/Makefile.in
+--- mono-1.9.1+dfsg~/web/Makefile.in 2008-04-23 21:53:58.000000000 +0200
++++ mono-1.9.1+dfsg/web/Makefile.in 2008-06-17 23:58:28.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.
Added: mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch 2008-06-17 22:02:12 UTC (rev 3654)
@@ -0,0 +1,304 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_bound_checking_r98524_r98527.dpatch by Jo Shields <directhex at apebox.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Pull in two SVN changesets to fix bound checking, which manifests itself
+## DP: as XSP failing to compile on amd64. Changelog entries and init_trampoline
+## DP: routine changes snipped to apply cleanly against 1.9.1
+
+ at DPATCH@
+Index: mono/mono/mini/tramp-ia64.c
+===================================================================
+--- mono/mono/mini/tramp-ia64.c (revision 98523)
++++ mono/mono/mini/tramp-ia64.c (revision 98524)
+@@ -76,7 +76,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
+ {
+ guint8 *callsite_begin;
+ guint64 *callsite = (guint64*)(gpointer)(code - 16);
+Index: mono/mono/mini/tramp-arm.c
+===================================================================
+--- mono/mono/mini/tramp-arm.c (revision 98523)
++++ mono/mono/mini/tramp-arm.c (revision 98524)
+@@ -75,7 +75,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *code_ptr, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr)
+ {
+ guint32 *code = (guint32*)code_ptr;
+
+Index: mono/mono/mini/mini.h
+===================================================================
+--- mono/mono/mini/mini.h (revision 98523)
++++ mono/mono/mini/mini.h (revision 98524)
+@@ -1254,7 +1254,7 @@
+ void mono_arch_save_unwind_info (MonoCompile *cfg) MONO_INTERNAL;
+ void mono_arch_register_lowlevel_calls (void) MONO_INTERNAL;
+ gpointer mono_arch_get_unbox_trampoline (MonoMethod *m, gpointer addr) MONO_INTERNAL;
+-void mono_arch_patch_callsite (guint8 *code, guint8 *addr) MONO_INTERNAL;
++void mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr) MONO_INTERNAL;
+ void mono_arch_patch_plt_entry (guint8 *code, guint8 *addr) MONO_INTERNAL;
+ void mono_arch_nullify_class_init_trampoline(guint8 *code, gssize *regs) MONO_INTERNAL;
+ void mono_arch_nullify_plt_entry (guint8 *code) MONO_INTERNAL;
+Index: mono/mono/mini/tramp-alpha.c
+===================================================================
+--- mono/mono/mini/tramp-alpha.c (revision 98523)
++++ mono/mono/mini/tramp-alpha.c (revision 98524)
+@@ -523,7 +523,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
+ {
+ unsigned long *p = (unsigned int *)(code-12);
+
+Index: mono/mono/mini/tramp-s390.c
+===================================================================
+--- mono/mono/mini/tramp-s390.c (revision 98523)
++++ mono/mono/mini/tramp-s390.c (revision 98524)
+@@ -128,7 +128,7 @@
+ /*------------------------------------------------------------------*/
+
+ void
+-mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
+ {
+ gint32 displace;
+ unsigned short opcode;
+Index: mono/mono/mini/tramp-amd64.c
+===================================================================
+--- mono/mono/mini/tramp-amd64.c (revision 98523)
++++ mono/mono/mini/tramp-amd64.c (revision 98524)
+@@ -69,7 +69,7 @@
+ * points to the pc right after the call.
+ */
+ void
+-mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
+ {
+ guint8 *code;
+ guint8 buf [16];
+Index: mono/mono/mini/tramp-ppc.c
+===================================================================
+--- mono/mono/mini/tramp-ppc.c (revision 98523)
++++ mono/mono/mini/tramp-ppc.c (revision 98524)
+@@ -85,7 +85,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *code_ptr, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *code_ptr, guint8 *addr)
+ {
+ guint32 *code = (guint32*)code_ptr;
+ /* This is the 'blrl' instruction */
+Index: mono/mono/mini/tramp-hppa.c
+===================================================================
+--- mono/mono/mini/tramp-hppa.c (revision 98523)
++++ mono/mono/mini/tramp-hppa.c (revision 98524)
+@@ -77,7 +77,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *p, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *p, guint8 *addr)
+ {
+ guint32 *code = (void *)p;
+ /* Search for and patch the calling sequence
+Index: mono/mono/mini/mini-trampolines.c
+===================================================================
+--- mono/mono/mini/mini-trampolines.c (revision 98523)
++++ mono/mono/mini/mini-trampolines.c (revision 98524)
+@@ -251,7 +251,7 @@
+ mono_jit_info_table_find (mono_domain_get (), mono_get_addr_from_ftnptr (addr));
+
+ if (mono_method_same_domain (ji, target_ji))
+- mono_arch_patch_callsite (code, addr);
++ mono_arch_patch_callsite (ji->code_start, code, addr);
+ }
+ }
+
+Index: mono/mono/mini/tramp-x86.c
+===================================================================
+--- mono/mono/mini/tramp-x86.c (revision 98523)
++++ mono/mono/mini/tramp-x86.c (revision 98524)
+@@ -58,7 +58,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
+ {
+ guint8 *code;
+ guint8 buf [8];
+Index: mono/mono/mini/tramp-s390x.c
+===================================================================
+--- mono/mono/mini/tramp-s390x.c (revision 98523)
++++ mono/mono/mini/tramp-s390x.c (revision 98524)
+@@ -128,7 +128,7 @@
+ /*------------------------------------------------------------------*/
+
+ void
+-mono_arch_patch_callsite (guint8 *orig_code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *orig_code, guint8 *addr)
+ {
+ gint32 displace;
+ unsigned short opcode;
+Index: mono/mono/mini/tramp-sparc.c
+===================================================================
+--- mono/mono/mini/tramp-sparc.c (revision 98523)
++++ mono/mono/mini/tramp-sparc.c (revision 98524)
+@@ -58,7 +58,7 @@
+ }
+
+ void
+-mono_arch_patch_callsite (guint8 *code, guint8 *addr)
++mono_arch_patch_callsite (guint8 *method_start, guint8 *code, guint8 *addr)
+ {
+ if (sparc_inst_op (*(guint32*)code) == 0x1) {
+ sparc_call_simple (code, (guint8*)addr - (guint8*)code);
+Index: mono/mono/mini/mini.h
+===================================================================
+--- mono/mono/mini/mini.h (revision 98526)
++++ mono/mono/mini/mini.h (revision 98527)
+@@ -1318,7 +1318,7 @@
+
+ extern gssize mono_breakpoint_info_index [MONO_BREAKPOINT_ARRAY_SIZE];
+
+-gboolean mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size);
++gboolean mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size);
+
+ /* Mono Debugger support */
+ void mono_debugger_init (void);
+Index: mono/mono/mini/mini-amd64.c
+===================================================================
+--- mono/mono/mini/mini-amd64.c (revision 98526)
++++ mono/mono/mini/mini-amd64.c (revision 98527)
+@@ -5494,12 +5494,33 @@
+ return 3;
+ }
+
++/**
++ * mono_breakpoint_clean_code:
++ *
++ * Copy @size bytes from @code - @offset to the buffer @buf. If the debugger inserted software
++ * breakpoints in the original code, they are removed in the copy.
++ *
++ * Returns TRUE if no sw breakpoint was present.
++ */
+ gboolean
+-mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size)
++mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size)
+ {
+ int i;
+ gboolean can_write = TRUE;
+- memcpy (buf, code, size);
++ /*
++ * If method_start is non-NULL we need to perform bound checks, since we access memory
++ * at code - offset we could go before the start of the method and end up in a different
++ * page of memory that is not mapped or read incorrect data anyway. We zero-fill the bytes
++ * instead.
++ */
++ if (!method_start || code - offset >= method_start) {
++ memcpy (buf, code - offset, size);
++ } else {
++ int diff = code - method_start;
++ memset (buf, 0, size);
++ memcpy (buf + offset - diff, method_start, diff + size - offset);
++ }
++ code -= offset;
+ for (i = 0; i < MONO_BREAKPOINT_ARRAY_SIZE; ++i) {
+ int idx = mono_breakpoint_info_index [i];
+ guint8 *ptr;
+@@ -5524,8 +5545,8 @@
+ gint32 disp;
+ guint8 rex = 0;
+
+- mono_breakpoint_clean_code (code - 10, buf, sizeof (buf));
+- code = buf + 10;
++ mono_breakpoint_clean_code (NULL, code, 9, buf, sizeof (buf));
++ code = buf + 9;
+
+ *displacement = 0;
+
+Index: mono/mono/mini/mini-x86.c
+===================================================================
+--- mono/mono/mini/mini-x86.c (revision 98526)
++++ mono/mono/mini/mini-x86.c (revision 98527)
+@@ -4570,12 +4570,33 @@
+ }
+ }
+
++/**
++ * mono_breakpoint_clean_code:
++ *
++ * Copy @size bytes from @code - @offset to the buffer @buf. If the debugger inserted software
++ * breakpoints in the original code, they are removed in the copy.
++ *
++ * Returns TRUE if no sw breakpoint was present.
++ */
+ gboolean
+-mono_breakpoint_clean_code (guint8 *code, guint8 *buf, int size)
++mono_breakpoint_clean_code (guint8 *method_start, guint8 *code, int offset, guint8 *buf, int size)
+ {
+ int i;
+ gboolean can_write = TRUE;
+- memcpy (buf, code, size);
++ /*
++ * If method_start is non-NULL we need to perform bound checks, since we access memory
++ * at code - offset we could go before the start of the method and end up in a different
++ * page of memory that is not mapped or read incorrect data anyway. We zero-fill the bytes
++ * instead.
++ */
++ if (!method_start || code - offset >= method_start) {
++ memcpy (buf, code - offset, size);
++ } else {
++ int diff = code - method_start;
++ memset (buf, 0, size);
++ memcpy (buf + offset - diff, method_start, diff + size - offset);
++ }
++ code -= offset;
+ for (i = 0; i < MONO_BREAKPOINT_ARRAY_SIZE; ++i) {
+ int idx = mono_breakpoint_info_index [i];
+ guint8 *ptr;
+@@ -4599,7 +4620,7 @@
+ guint8 reg = 0;
+ gint32 disp = 0;
+
+- mono_breakpoint_clean_code (code - 8, buf, sizeof (buf));
++ mono_breakpoint_clean_code (NULL, code, 8, buf, sizeof (buf));
+ code = buf + 8;
+
+ *displacement = 0;
+Index: mono/mono/mini/tramp-amd64.c
+===================================================================
+--- mono/mono/mini/tramp-amd64.c (revision 98526)
++++ mono/mono/mini/tramp-amd64.c (revision 98527)
+@@ -73,7 +73,7 @@
+ {
+ guint8 *code;
+ guint8 buf [16];
+- gboolean can_write = mono_breakpoint_clean_code (orig_code - 14, buf, sizeof (buf));
++ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 14, buf, sizeof (buf));
+
+ code = buf + 14;
+
+Index: mono/mono/mini/tramp-x86.c
+===================================================================
+--- mono/mono/mini/tramp-x86.c (revision 98526)
++++ mono/mono/mini/tramp-x86.c (revision 98527)
+@@ -62,7 +62,7 @@
+ {
+ guint8 *code;
+ guint8 buf [8];
+- gboolean can_write = mono_breakpoint_clean_code (orig_code - 8, buf, sizeof (buf));
++ gboolean can_write = mono_breakpoint_clean_code (method_start, orig_code, 8, buf, sizeof (buf));
+
+ code = buf + 8;
+ if (mono_running_on_valgrind ())
Property changes on: mono/trunk/debian/patches/fix_bound_checking_r98524_r98527.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/patches/fix_softfloat_r105848.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_softfloat_r105848.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix_softfloat_r105848.dpatch 2008-06-17 22:02:12 UTC (rev 3654)
@@ -0,0 +1,120 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_softfloat_r105848.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes softfloat issues causing SIGABRT on armel, see
+## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=485112
+## DP: Patch taken from upstream SVN revision 105848.
+
+ at DPATCH@
+diff -urNad mono-1.9.1+dfsg~/mono/mini/mini.c mono-1.9.1+dfsg/mono/mini/mini.c
+--- mono-1.9.1+dfsg~/mono/mini/mini.c 2008-02-06 21:28:25.000000000 +0100
++++ mono-1.9.1+dfsg/mono/mini/mini.c 2008-06-17 23:29:29.000000000 +0200
+@@ -622,7 +622,6 @@
+ (cfg)->disable_ssa = TRUE; \
+ } while (0)
+
+-
+ #define NEW_INDLOAD(cfg,dest,addr,vtype) do { \
+ (dest) = mono_mempool_alloc0 ((cfg)->mempool, sizeof (MonoInst)); \
+ (dest)->inst_left = addr; \
+@@ -2857,11 +2856,23 @@
+ MONO_INST_NEW (cfg, (ins), OP_NOP); \
+ } \
+ } while (0)
++
++#define NEW_TEMPLOAD_SOFT_FLOAT(cfg,bblock,ins,num) do { \
++ if ((ins)->opcode == CEE_LDIND_R4) { \
++ int idx = (num); \
++ int temp; \
++ NEW_TEMPLOADA (cfg, (ins), (idx)); \
++ temp = handle_load_float (cfg, (bblock), (ins), ip); \
++ NEW_TEMPLOAD (cfg, (ins), (temp)); \
++ } \
++ } while (0)
++
+ #else
+ #define LDLOC_SOFT_FLOAT(cfg,ins,idx,ip)
+ #define STLOC_SOFT_FLOAT(cfg,ins,idx,ip)
+ #define LDARG_SOFT_FLOAT(cfg,ins,idx,ip)
+ #define STARG_SOFT_FLOAT(cfg,ins,idx,ip)
++#define NEW_TEMPLOAD_SOFT_FLOAT(cfg,bblock,ins,num)
+ #endif
+
+ static MonoMethod*
+@@ -3820,14 +3831,7 @@
+
+ if (rvar) {
+ NEW_TEMPLOAD (cfg, ins, rvar->inst_c0);
+-#ifdef MONO_ARCH_SOFT_FLOAT
+- if (ins->opcode == CEE_LDIND_R4) {
+- int temp;
+- NEW_TEMPLOADA (cfg, ins, rvar->inst_c0);
+- temp = handle_load_float (cfg, bblock, ins, ip);
+- NEW_TEMPLOAD (cfg, ins, temp);
+- }
+-#endif
++ NEW_TEMPLOAD_SOFT_FLOAT (cfg, ebblock, ins, rvar->inst_c0);
+ *sp++ = ins;
+ }
+ *last_b = ebblock;
+@@ -5549,7 +5553,6 @@
+ //g_assert (returnvar != -1);
+ NEW_TEMPSTORE (cfg, store, return_var->inst_c0, *sp);
+ store->cil_code = sp [0]->cil_code;
+- /* FIXME: handle CEE_STIND_R4 */
+ if (store->opcode == CEE_STOBJ) {
+ g_assert_not_reached ();
+ NEW_TEMPLOADA (cfg, store, return_var->inst_c0);
+@@ -5923,6 +5926,31 @@
+ case CEE_CONV_R_UN:
+ CHECK_STACK (1);
+ ADD_UNOP (*ip);
++
++#ifdef MONO_ARCH_SOFT_FLOAT
++ /*
++ * Its rather hard to emit the soft float code during the decompose
++ * pass, so avoid it in some specific cases.
++ */
++ if (ins->opcode == OP_LCONV_TO_R4) {
++ MonoInst *conv;
++
++ ins->opcode = OP_LCONV_TO_R8;
++ ins->type = STACK_R8;
++
++ --sp;
++ *sp++ = emit_tree (cfg, bblock, ins, ip + 1);
++
++ MONO_INST_NEW (cfg, conv, CEE_CONV_R4);
++ conv->inst_left = sp [-1];
++ conv->type = STACK_R8;
++ sp [-1] = ins;
++
++ ip++;
++ break;
++ }
++#endif
++
+ if (mono_find_jit_opcode_emulation (ins->opcode)) {
+ --sp;
+ *sp++ = emit_tree (cfg, bblock, ins, ip + 1);
+@@ -6734,6 +6762,7 @@
+ } else {
+ temp = mono_emit_method_call_spilled (cfg, bblock, wrapper, mono_method_signature (wrapper), iargs, ip, NULL);
+ NEW_TEMPLOAD (cfg, *sp, temp);
++ NEW_TEMPLOAD_SOFT_FLOAT (cfg, bblock, *sp, temp);
+ sp++;
+ }
+ } else {
+diff -urNad mono-1.9.1+dfsg~/mono/mini/mini.h mono-1.9.1+dfsg/mono/mini/mini.h
+--- mono-1.9.1+dfsg~/mono/mini/mini.h 2008-06-17 23:28:42.000000000 +0200
++++ mono-1.9.1+dfsg/mono/mini/mini.h 2008-06-17 23:29:29.000000000 +0200
+@@ -244,7 +244,7 @@
+ mono_container_of(ptr, type, member)*/
+
+ #define MONO_INST_LIST_ENTRY(ptr, type, member) \
+- ((type *)(ptr))
++ ((type *)(gpointer)(ptr))
+
+ #define MONO_INST_LIST_FIRST_ENTRY(ptr, type, member) \
+ MONO_INST_LIST_ENTRY((ptr)->next, type, member)
Property changes on: mono/trunk/debian/patches/fix_softfloat_r105848.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch 2008-06-17 22:02:12 UTC (rev 3654)
@@ -0,0 +1,74 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_stack_alignment_r105650_r105651.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes stack alignment, caused assertions on AMD64, see:
+## DP: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=473119
+## DP: Patch taken from upstream SVN revision 105650 and 105651.
+
+ at DPATCH@
+diff -urNad mono-1.9.1+dfsg~/mono/metadata/threads.c mono-1.9.1+dfsg/mono/metadata/threads.c
+--- mono-1.9.1+dfsg~/mono/metadata/threads.c 2008-01-29 23:02:34.000000000 +0100
++++ mono-1.9.1+dfsg/mono/metadata/threads.c 2008-06-17 23:42:04.000000000 +0200
+@@ -700,8 +700,8 @@
+ /*
+ * mono_thread_get_stack_bounds:
+ *
+- * Return the address and size of the current threads stack. Return NULL as the stack
+- * address if the stack address cannot be determined.
++ * Return the address and size of the current threads stack. Return NULL as the
++ * stack address if the stack address cannot be determined.
+ */
+ void
+ mono_thread_get_stack_bounds (guint8 **staddr, size_t *stsize)
+@@ -709,6 +709,7 @@
+ #if defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP)
+ *staddr = (guint8*)pthread_get_stackaddr_np (pthread_self ());
+ *stsize = pthread_get_stacksize_np (pthread_self ());
++ *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1));
+ return;
+ /* FIXME: simplify the mess below */
+ #elif !defined(PLATFORM_WIN32)
+@@ -717,28 +718,31 @@
+
+ pthread_attr_init (&attr);
+ #ifdef HAVE_PTHREAD_GETATTR_NP
+- pthread_getattr_np (pthread_self(), &attr);
++ pthread_getattr_np (pthread_self(), &attr);
+ #else
+ #ifdef HAVE_PTHREAD_ATTR_GET_NP
+- pthread_attr_get_np (pthread_self(), &attr);
++ pthread_attr_get_np (pthread_self(), &attr);
+ #elif defined(sun)
+- *staddr = NULL;
+- pthread_attr_getstacksize (&attr, &stsize);
++ *staddr = NULL;
++ pthread_attr_getstacksize (&attr, &stsize);
+ #else
+- *staddr = NULL;
+- *stsize = 0;
+- return;
++ *staddr = NULL;
++ *stsize = 0;
++ return;
+ #endif
+ #endif
+
+ #ifndef sun
+- pthread_attr_getstack (&attr, (void**)staddr, stsize);
+- if (*staddr)
+- g_assert ((current > *staddr) && (current < *staddr + *stsize));
++ pthread_attr_getstack (&attr, (void**)staddr, stsize);
++ if (*staddr)
++ g_assert ((current > *staddr) && (current < *staddr + *stsize));
+ #endif
+
+- pthread_attr_destroy (&attr);
++ pthread_attr_destroy (&attr);
+ #endif
++
++ /* When running under emacs, sometimes staddr is not aligned to a page size */
++ *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1));
+ }
+
+ MonoThread *
Property changes on: mono/trunk/debian/patches/fix_stack_alignment_r105650_r105651.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch
===================================================================
--- mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch (rev 0)
+++ mono/trunk/debian/patches/fix_xen_support_r103474_r103475.dpatch 2008-06-17 22:02:12 UTC (rev 3654)
@@ -0,0 +1,79 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_xen.dpatch by Andrew Deason <adeason2 at uiuc.edu>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes Xen-specific build options by actually passing CFLAGS to
+## DP: libgc's Makefile
+
+ at DPATCH@
+
+--- mono/configure.in 2008-05-19 21:13:13.000000000 -0500
++++ mono/configure.in 2008-05-19 21:13:21.000000000 -0500
+@@ -36,6 +36,11 @@
+ gc_default=boehm
+ fi
+
++# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
++# libgc should inherit the original CFLAGS/CPPFLAGS passed to configure, i.e. -O0
++CPPFLAGS_FOR_LIBGC=$CPPFLAGS
++CFLAGS_FOR_LIBGC=$CFLAGS
++
+ #
+ # These are the flags that need to be stored in the mono.pc file for
+ # compiling code that will embed Mono
+@@ -301,6 +306,8 @@
+ #AC_DISABLE_FAST_INSTALL
+ AM_PROG_LIBTOOL
+
++DOLT
++
+ # Test whenever ld supports -version-script
+ AC_PROG_LD
+ AC_PROG_LD_GNU
+@@ -399,6 +406,7 @@
+ esac
+ fi
+ CFLAGS="$CFLAGS -g $WARN"
++CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -g"
+
+ # Where's the 'mcs' source tree?
+ if test -d $srcdir/mcs; then
+@@ -556,6 +564,8 @@
+ void main () { }
+ ], [
+ AC_MSG_RESULT(yes)
++ # Pass it to libgc as well
++ CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -mno-tls-direct-seg-refs"
+ ], [
+ AC_MSG_RESULT(no)
+ CFLAGS=$ORIG_CFLAGS
+@@ -1981,7 +2001,10 @@
+ # We should use a separate variable for this to avoid passing useless and
+ # potentially problematic defines to libgc (like -D_FILE_OFFSET_BITS=64)
+ # This should be executed late so we pick up the final version of CPPFLAGS
+- ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS=$CPPFLAGS\""
++ # The problem with this approach, is that during a reconfigure, the main
++ # configure scripts gets invoked with these arguments, so we use separate
++ # variables understood by libgc's configure to pass CPPFLAGS and CFLAGS.
++ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
+ AC_CONFIG_SUBDIRS(libgc)
+ ;;
+ esac
+
+--- mono/libgc/configure.in 2008-05-19 14:08:04 UTC (rev 103473)
++++ mono/libgc/configure.in 2008-05-19 14:30:46 UTC (rev 103474)
+@@ -39,6 +39,15 @@
+
+ . [$]{srcdir}/configure.host
+
++# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono
++# configure, because of autoconf brokeness
++if test "x$CPPFLAGS_FOR_LIBGC" != "x"; then
++ CPPFLAGS=$CPPFLAGS_FOR_LIBGC
++fi
++if test "x$CFLAGS_FOR_LIBGC" != "x"; then
++ CFLAGS=$CFLAGS_FOR_LIBGC
++fi
++
+ GC_CFLAGS=${gc_cflags}
+ AC_SUBST(GC_CFLAGS)
More information about the Pkg-mono-svn-commits
mailing list