diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:55:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-07-19 08:55:27 +0000 |
| commit | 9523e1a72433a15b237b9d339e15d00f01c727ac (patch) | |
| tree | 928e945f40d0f84ff1b37f9c19a2f1a8f2fbde96 /sal | |
| parent | 9cd8ba6aaf0f0e4decdb33b652dbdef43664d939 (diff) | |
INTEGRATION: CWS configure18 (1.27.108); FILE MERGED
2006/06/11 00:28:27 rene 1.27.108.2: #i64923# make PAM optional on Linux, patch by geki
2006/06/11 00:22:03 rene 1.27.108.1: #i64922# fix LINUX check (by geki)
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk index c0629e915b80..e1bdd76b7c10 100644 --- a/sal/osl/unx/makefile.mk +++ b/sal/osl/unx/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.28 $ # -# last change: $Author: rt $ $Date: 2005-09-08 14:57:34 $ +# last change: $Author: kz $ $Date: 2006-07-19 09:55:27 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -121,7 +121,13 @@ OBJFILES += $(OBJ)$/backtrace.obj APP1STDLIBS+=-lC .ENDIF -.IF "$(LINUX)" == "YES" +.IF "$(OS)" == "LINUX" +.IF "$(PAM)" == "NO" +CFLAGS+=-DNOPAM +.IF "$(NEW_SHADOW_API)" == "YES" +CFLAGS+=-DNEW_SHADOW_API +.ENDIF +.ENDIF .IF "$(PAM_LINK)" == "YES" CFLAGS+=-DPAM_LINK .ENDIF |