aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-04-20 20:33:04 -0700
committerGlenn Morris2010-04-20 20:33:04 -0700
commit2807228d2cb72b68f1dd9d97fea6b587d83c346b (patch)
tree06a8f867ea1cba94b7b6cb795d998ec10681548f /src
parent022c122ac70704f3c0af86e1614592bd957a7703 (diff)
downloademacs-2807228d2cb72b68f1dd9d97fea6b587d83c346b.tar.gz
emacs-2807228d2cb72b68f1dd9d97fea6b587d83c346b.zip
Remove LIBSELINUX_LIBS need for cpp in Makefiles.
* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles. * src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 2da967958cd..716e6240320 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-04-21 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (LIBSELINUX_LIBS): Move out of #ifdef.
4
12010-04-21 Karel Klíč <kklic@redhat.com> 52010-04-21 Karel Klíč <kklic@redhat.com>
2 6
3 * Makefile.in (LIBSELINUX_LIBS): New. 7 * Makefile.in (LIBSELINUX_LIBS): New.
diff --git a/src/Makefile.in b/src/Makefile.in
index 913ac5a847e..1bb05c9e27e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -92,6 +92,8 @@ CFLAGS_SOUND= @CFLAGS_SOUND@
92RSVG_LIBS= @RSVG_LIBS@ 92RSVG_LIBS= @RSVG_LIBS@
93RSVG_CFLAGS= @RSVG_CFLAGS@ 93RSVG_CFLAGS= @RSVG_CFLAGS@
94 94
95LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
96
95INTERVALS_H = dispextern.h intervals.h composite.h 97INTERVALS_H = dispextern.h intervals.h composite.h
96 98
97GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ 99GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -243,10 +245,6 @@ shared=no
243DBUS_OBJ = dbusbind.o 245DBUS_OBJ = dbusbind.o
244#endif 246#endif
245 247
246#ifdef HAVE_LIBSELINUX
247LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
248#endif
249
250/* DO NOT use -R. There is a special hack described in lastfile.c 248/* DO NOT use -R. There is a special hack described in lastfile.c
251 which is used instead. Some initialized data areas are modified 249 which is used instead. Some initialized data areas are modified
252 at initial startup, then labeled as part of the text area when 250 at initial startup, then labeled as part of the text area when