diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-19 13:39:55 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-19 13:39:55 +0000 |
| commit | 699945d95dfb0112584c8ab815b89c305b18ae6f (patch) | |
| tree | 8bbc091b76ace7d1c3a1c572ee62cc745efaa555 /solenv/inc/unxmacx.mk | |
| parent | 9f2b573715b3896a9cb0d07e4c3d3a5cff2f4824 (diff) | |
#i10000# avoid problems with --without-stlport combined with --with-x
Diffstat (limited to 'solenv/inc/unxmacx.mk')
| -rw-r--r-- | solenv/inc/unxmacx.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 4596c3992..e7ec2b9b4 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -4,9 +4,9 @@ # # $RCSfile: unxmacx.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: vg $ $Date: 2008-03-18 13:11:14 $ +# last change: $Author: vg $ $Date: 2008-03-19 14:39:55 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -52,7 +52,7 @@ LINKOUTPUT_FILTER= # -D_PTHREADS and -D_REENTRANT are needed for STLport, and must be specified when # compiling STLport sources too, either internally or externally. CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNO_PTHREAD_PRIORITY $(PROCESSOR_DEFINES) -DSTLPORT_VERSION=$(STLPORT_VER) -D_USE_NAMESPACE=1 -.IF "$(GUIBASE)"=="unx" +.IF "$(GUIBASE)"=="unx" && "$(USE_SYSTEM_STL)"!="YES" CDEFS+= -DX_LOCALE .ENDIF |