INTEGRATION: CWS configure14 (1.36.138); FILE MERGED

2006/01/23 19:17:40 rene 1.36.138.2: RESYNC: (1.36-1.37); FILE MERGED
2006/01/07 17:44:22 rene 1.36.138.1: #i59160# allow usage of tcmalloc and system-malloc

solenv/inc/unxlngi4.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: unxlngi4.mk,v $
 #
-#   $Revision: 1.37 $
+#   $Revision: 1.38 $
 #
-#   last change: $Author: obo $ $Date: 2006-01-20 10:49:30 $
+#   last change: $Author: kz $ $Date: 2006-01-31 18:27:28 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -168,16 +168,27 @@ STDSLOGUI=
 STDOBJCUI=
 STDSLOCUI=
 
+.IF "$(ALLOC)" == "TCMALLOC"
+STDLIBCUIST+=-ltcmalloc
+STDLIBGUIMT+=-ltcmalloc
+STDLIBCUIMT+=-ltcmalloc
+STDLIBGUIST+=-ltcmalloc
+STDSHLGUIMT+=-ltcmalloc
+STDSHLCUIMT+=-ltcmalloc
+STDSHLGUIST+=-ltcmalloc
+STDSHLCUIST+=-ltcmalloc
+.ENDIF
+
 # libraries for linking applications
-STDLIBCUIST=-ldl -lm
-STDLIBGUIMT=-lX11 -ldl -lpthread -lm
-STDLIBCUIMT=-ldl -lpthread -lm
-STDLIBGUIST=-lX11 -ldl -lm
+STDLIBCUIST+=-ldl -lm
+STDLIBGUIMT+=-lX11 -ldl -lpthread -lm
+STDLIBCUIMT+=-ldl -lpthread -lm
+STDLIBGUIST+=-lX11 -ldl -lm
 # libraries for linking shared libraries
-STDSHLGUIMT=-lX11 -lXext -ldl -lpthread -lm
-STDSHLCUIMT=-ldl -lpthread -lm
-STDSHLGUIST=-lX11 -lXext -ldl -lm
-STDSHLCUIST=-ldl -lm
+STDSHLGUIMT+=-lX11 -lXext -ldl -lpthread -lm
+STDSHLCUIMT+=-ldl -lpthread -lm
+STDSHLGUIST+=-lX11 -lXext -ldl -lm
+STDSHLCUIST+=-ldl -lm
 
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive