diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 12:44:40 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-13 12:44:40 +0000 |
| commit | fc4f9400324aaf4c003a4e2052e40019588fa8c4 (patch) | |
| tree | fd268b48565a2a54419d10c464d86535e3a52e63 /solenv/inc/libs.mk | |
| parent | dfe70943d3c4f50ebce9af668f09b685dba1d04f (diff) | |
INTEGRATION: CWS hunspellexternal (1.117.80); FILE MERGED
2008/04/22 14:12:05 cmc 1.117.80.4: move into libs.mk for hamburg env
2008/04/21 09:29:32 rene 1.117.80.3: RESYNC: (1.123-1.131); FILE MERGED
2008/01/04 19:28:23 rene 1.117.80.2: RESYNC: (1.117-1.123); FILE MERGED
2007/10/08 11:09:34 rene 1.117.80.1: add HUNSPELL BUILD_TYPE, make dictmgr.hxx used from hunspell, remove HUNSPELLIB from solenv/inc/libs.mk
Diffstat (limited to 'solenv/inc/libs.mk')
| -rw-r--r-- | solenv/inc/libs.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index bbb83eb656ef..ccfaa05157fd 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -8,7 +8,7 @@ # # $RCSfile: libs.mk,v $ # -# $Revision: 1.133 $ +# $Revision: 1.134 $ # # This file is part of OpenOffice.org. # @@ -28,7 +28,7 @@ # for a copy of the LGPLv3 License. # #************************************************************************* -LIBSMKREV!:="$$Revision: 1.133 $$" +LIBSMKREV!:="$$Revision: 1.134 $$" .IF "$(GUI)"=="UNX" || "$(COM)"=="GCC" @@ -333,8 +333,12 @@ HNJLIB*=-lhyphen MYSPELLLIB=-lmyspell COSVLIB=-lcosv UDMLIB=-ludm -HUNSPELLLIB*=-lhunspell ULINGULIB=-lulingu +.IF "$(SYSTEM_HUNSPELL)" == "YES" +HUNSPELLLIB=$(HUNSPELL_LIBS) +.ELSE +HUNSPELLLIB=-lhunspell-1.1 +.ENDIF MYTHESLIB=-lmythes PYUNOLIB=-lpyuno LPSOLVELIB=-llpsolve55 @@ -493,8 +497,12 @@ HNJLIB*=libhnj.lib MYSPELLLIB= $(LIBPRE) myspell.lib COSVLIB= $(LIBPRE) cosv.lib UDMLIB= $(LIBPRE) udm.lib -HUNSPELLLIB*=hunspell.lib ULINGULIB=$(LIBPRE) libulingu.lib +.IF "$(SYSTEM_HUNSPELL)" == "YES" +HUNSPELLLIB=$(HUNSPELL_LIBS) +.ELSE +HUNSPELLLIB=$(LIBPRE) libhunspell.lib +.ENDIF MYTHESLIB=libmythes.lib PYUNOLIB=ipyuno.lib LPSOLVELIB=lpsolve55.lib |