From: Roland McGrath <roland@gnu.org>
Date: Tue, 4 Apr 2006 07:32:53 +0000 (+0000)
Subject: [BZ #2508]
X-Git-Tag: upstream/2.30~15655
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=729f7b28c598e1623c5bba3495e1447342ffc82d;p=external%2Fglibc.git

[BZ #2508]

	* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting
	inside [$(have-selinux) = yes].
	($(objpfx)selinux.o: sysincludes): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 74cc0e9..7235b2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-04-04  Roland McGrath  <roland@redhat.com>
 
+	[BZ #2508]
+	* nscd/Makefile ($(objpfx)nscd_stat.o: sysincludes): Move setting
+	inside [$(have-selinux) = yes].
+	($(objpfx)selinux.o: sysincludes): Likewise.
+
 	* iconvdata/Makefile (generate-8bit-table): Use LC_ALL=C.
 	(generate-8bit-gap-table): Likewise.
 	($(objpfx)iso8859-7jp.stmp): Likewise.
diff --git a/nscd/Makefile b/nscd/Makefile
index e91c289..0b35964 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -1,4 +1,5 @@
-# Copyright (C) 1998,2000,2002,2003,2004,2005 Free Software Foundation, Inc.
+# Copyright (C) 1998,2000,2002,2003,2004,2005,2006
+#	Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -58,9 +59,6 @@ endif
 
 nscd-modules += selinux
 selinux-LIBS := -lselinux $(libaudit)
-endif
-
-LDLIBS-nscd = $(selinux-LIBS)
 
 # The configure.in check for libselinux and its headers did not use
 # $SYSINCLUDES.  The directory specified by --with-headers usually
@@ -69,6 +67,9 @@ LDLIBS-nscd = $(selinux-LIBS)
 # system headers will be ok for this file.
 $(objpfx)nscd_stat.o: sysincludes = # nothing
 $(objpfx)selinux.o: sysincludes = # nothing
+endif
+
+LDLIBS-nscd = $(selinux-LIBS)
 
 distribute := nscd.h nscd-client.h dbg_log.h \
 	      $(addsuffix .c, $(filter-out xmalloc,$(all-nscd-modules))) \