Version 3.6.0.4, tag libreoffice-3.6.0.4
[LibreOffice.git] / redland / raptor / raptor-1.4.18.patch.autotools
blobb91444edc813a82f286ff5c2f03ddb2a53721690
1 --- misc/raptor-1.4.18/config.sub       2008-04-03 05:15:09.000000000 +0200
2 +++ misc/build/raptor-1.4.18/config.sub 2011-09-27 10:01:06.000000000 +0200
3 @@ -120,7 +120,7 @@
4  # Here we must recognize all the valid KERNEL-OS combinations.
5  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
6  case $maybe_os in
7 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
8 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
9    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
10    storm-chaos* | os2-emx* | rtmk-nova*)
11      os=-$maybe_os
12 @@ -1250,7 +1250,7 @@
13               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
14               | -chorusos* | -chorusrdb* \
15               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
16 -             | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
17 +             | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
18               | -uxpv* | -beos* | -mpeix* | -udk* \
19               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
20               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
21 --- misc/raptor-1.4.18/configure        Sun Jun 15 10:25:55 2008
22 +++ misc/build/raptor-1.4.18/configure  Wed Feb 18 13:23:12 2009
23 @@ -4321,7 +4321,7 @@
25  cygwin*)
26    # func_win32_libid is a shell function defined in ltmain.sh
27 -  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
28 +  lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
29    lt_cv_file_magic_cmd='func_win32_libid'
30    ;;
32 @@ -4330,7 +4330,7 @@
33    # func_win32_libid shell function, so use a weaker test based on 'objdump',
34    # unless we find 'file', for example because we are cross-compiling.
35    if ( file / ) >/dev/null 2>&1; then
36 -    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
37 +    lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
38      lt_cv_file_magic_cmd='func_win32_libid'
39    else
40      lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
41 --- misc/raptor-1.4.18/ltmain.sh        2008-02-02 22:28:24.000000000 +0900
42 +++ misc/build/raptor-1.4.18/ltmain.sh  2008-07-08 11:58:42.000000000 +0900
43 @@ -3262,9 +3262,9 @@
44             revision="$number_revision"
45             ;;
46           freebsd-aout|freebsd-elf|sunos)
47 -           current="$number_major"
48 -           revision="$number_minor"
49 -           age="0"
50 +           current=`expr $number_major + $number_minor`
51 +           age="$number_minor"
52 +           revision="$number_revision"
53             ;;
54           irix|nonstopux)
55             current=`expr $number_major + $number_minor`
56 @@ -3344,8 +3344,8 @@
57           ;;
59         freebsd-elf)
60 -         major=".$current"
61 -         versuffix=".$current";
62 +         major=.`expr $current - $age`
63 +         versuffix="$major.$age.$revision"
64           ;;
66         irix | nonstopux)