strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS configure17 (1.40.36); FILE MERGED

Browse source 
2006/04/12 19:49:51 rene 1.40.36.3: RESYNC: (1.40-1.41); FILE MERGED
2006/04/03 16:43:43 rene 1.40.36.2: #i63782# improve ldap configure patch, patch by geki
2006/03/22 13:13:24 rene 1.40.36.1: #i61380# make it possible to disable neon, patch by "geki"
This commit is contained in:
Jens-Heiner Rechtien 2006-04-20 12:35:04 +00:00
parent d0533e39ff
commit 6770aca5bd
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scp2/source/ooo/makefile.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.42 $
# $Revision: 1.43 $
#
# last change: $Author: hr $ $Date: 2006-04-19 15:15:02 $
# last change: $Author: hr $ $Date: 2006-04-20 13:35:04 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -120,8 +120,8 @@ SCPDEFS+=-DWITHOUT_MOZILLA
SCPDEFS+=-DSYSTEM_MOZILLA
.ENDIF
.IF "$(WITH_OPENLDAP)" == "YES"
SCPDEFS+=-DWITH_OPENLDAP
.IF "$(WITH_LDAP)" == "YES"
SCPDEFS+=-DWITH_LDAP
.ENDIF
.IF "$(SYSTEM_CURL)" == "YES"
@ -183,6 +183,10 @@ SCPDEFS+=\
-DICU_MICRO=$(ICU_MICRO) \
-DISOLANG_MAJOR=$(ISOLANG_MAJOR)
.IF "$(DISABLE_NEON)" == "TRUE"
SCPDEFS+=-DDISABLE_NEON
.ENDIF
SCP_PRODUCT_TYPE=osl
PARFILES= \