cut out noise in junit stacktrace for output, but keep them in log
[LibreOffice.git] / libcmis / libcmis-0.1.0-autotools.patch
blob05780ac09f0e048a6584655c4ab1e5046433e03b
1 --- a/configure.ac
2 +++ b/configure.ac
3 @@ -42,6 +42,11 @@ AS_IF([test x"$GCC" = xyes], [
4 CXXFLAGS="$CXXFLAGS -Wall -pedantic"
5 ])
7 +AC_ARG_WITH([libxml2],
8 + [AS_HELP_STRING([--with-libxml2=PREFIX], [look for the xml2 library in
9 + PREFIX/lib and headers in PREFIX/include])]
12 LIBCMIS_API_VERSION=libcmis_api_version
13 AC_SUBST(LIBCMIS_API_VERSION)
15 @@ -62,7 +67,7 @@ AC_SUBST(CURL_CFLAGS)
16 AC_SUBST(LIBCURL)
18 # Check for lixml2
19 -AC_PATH_PROGS([TOOL_XML2_CONFIG], [xml2-config])
20 +AC_PATH_PROGS([TOOL_XML2_CONFIG], [xml2-config],, [$with_libxml2/bin:$PATH])
21 AS_IF([test -n "$TOOL_XML2_CONFIG"],
22 [XML2_CFLAGS=`$TOOL_XML2_CONFIG --cflags`
23 XML2_LIBS=`$TOOL_XML2_CONFIG --libs`],
24 --- bleh/config.sub 2011-09-27 22:48:43.000000000 +0200
25 +++ blah/config.sub 2011-10-04 09:26:51.000000000 +0200
26 @@ -4,7 +4,7 @@
27 # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
28 # Free Software Foundation, Inc.
30 -timestamp='2009-11-20'
31 +timestamp='2011-10-04'
33 # This file is (in principle) common to ALL GNU software.
34 # The presence of a machine in this file suggests that SOME GNU software
35 @@ -123,7 +123,7 @@
36 # Here we must recognize all the valid KERNEL-OS combinations.
37 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
38 case $maybe_os in
39 - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
40 + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
41 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
42 kopensolaris*-gnu* | \
43 storm-chaos* | os2-emx* | rtmk-nova*)
44 @@ -1294,7 +1294,7 @@
45 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
46 | -chorusos* | -chorusrdb* | -cegcc* \
47 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
48 - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
49 + | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
50 | -uxpv* | -beos* | -mpeix* | -udk* \
51 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
52 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \