Contents of /trunk/openoffice/patches/openoffice-3.2.1-system-mythes.patch
Parent Directory | Revision Log
Revision 1115 -
(show annotations)
(download)
Sun Aug 22 18:37:54 2010 UTC (14 years, 2 months ago) by niro
File size: 2159 byte(s)
Sun Aug 22 18:37:54 2010 UTC (14 years, 2 months ago) by niro
File size: 2159 byte(s)
-added
1 | diff --git a/configure.in b/configure.in |
2 | --- configure.in |
3 | +++ configure.in |
4 | @@ -5090,15 +5090,29 @@ |
5 | if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then |
6 | AC_MSG_RESULT([external]) |
7 | SYSTEM_MYTHES=YES |
8 | - AC_CHECK_HEADER(mythes.hxx, [], |
9 | - [ AC_MSG_ERROR(mythes.hxx headers not found.)], []) |
10 | - AC_CHECK_LIB(mythes, main, [], |
11 | - [ AC_MSG_ERROR(mythes library not found.)], []) |
12 | + AC_LANG_PUSH([C++]) |
13 | + PKG_CHECK_MODULES(MYTHES, mythes, MYTHES_PKGCONFIG=yes, MYTHES_PKGCONFIG=no) |
14 | + if test "$MYTHES_PKGCONFIG" = "no"; then |
15 | + AC_CHECK_HEADER(mythes.hxx, [], |
16 | + [ AC_MSG_ERROR(mythes.hxx headers not found.)], []) |
17 | + AC_CHECK_LIB(mythes-1.2, main, [], |
18 | + [ MYTHES_FOUND=no], []) |
19 | + if test "$MYTHES_FOUND" = "no"; then |
20 | + AC_CHECK_LIB(mythes, main, [MYTHES_FOUND=yes], |
21 | + [ MYTHES_FOUND=no], []) |
22 | + fi |
23 | + if test "$MYTHES_FOUND" = "no"; then |
24 | + AC_MSG_ERROR([mythes library not found!.]) |
25 | + fi |
26 | + fi |
27 | + AC_LANG_POP([C++]) |
28 | else |
29 | AC_MSG_RESULT([internal]) |
30 | SYSTEM_MYTHES=NO |
31 | fi |
32 | AC_SUBST(SYSTEM_MYTHES) |
33 | +AC_SUBST(MYTHES_CFLAGS) |
34 | +AC_SUBST(MYTHES_LIBS) |
35 | |
36 | dnl =================================================================== |
37 | dnl Checking for lpsolve |
38 | diff --git a/set_soenv.in b/set_soenv.in |
39 | --- set_soenv.in |
40 | +++ set_soenv.in |
41 | @@ -1878,6 +1878,8 @@ |
42 | ToFile( "SYSTEM_HYPH", "@SYSTEM_HYPH@", "e" ); |
43 | ToFile( "HYPHEN_LIB", "@HYPHEN_LIB@", "e" ); |
44 | ToFile( "SYSTEM_MYTHES", "@SYSTEM_MYTHES@", "e" ); |
45 | +ToFile( "MYTHES_CFLAGS", "@MYTHES_CFLAGS@", "e" ); |
46 | +ToFile( "MYTHES_LIBS", "@MYTHES_LIBS@", "e" ); |
47 | ToFile( "PAM", "@PAM@", "e" ); |
48 | ToFile( "NEW_SHADOW_API", "@NEW_SHADOW_API@", "e" ); |
49 | ToFile( "PAM_LINK", "@PAM_LINK@", "e" ); |
50 | diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk |
51 | --- solenv/inc/libs.mk |
52 | +++ solenv/inc/libs.mk |
53 | @@ -342,7 +342,11 @@ |
54 | .ELSE |
55 | HUNSPELLLIB=-lhunspell-1.2 |
56 | .ENDIF |
57 | +.IF "$(SYSTEM_MYTHES)" == "YES" |
58 | +MYTHESLIB=$(MYTHES_LIBS) |
59 | +.ELSE |
60 | MYTHESLIB=-lmythes |
61 | +.ENDIF |
62 | PYUNOLIB=-lpyuno |
63 | LPSOLVELIB=-llpsolve55 |
64 | SOFFICELIB=-lsofficeapp |