Mercurial > emacs
changeset 108014:c85d877f94f1
Remove LIBSELINUX_LIBS need for cpp in Makefiles.
* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
* src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Tue, 20 Apr 2010 20:33:04 -0700 |
| parents | 393a4e5223b1 |
| children | f3c91f3abae4 |
| files | ChangeLog configure.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Apr 20 20:11:03 2010 -0700 +++ b/ChangeLog Tue Apr 20 20:33:04 2010 -0700 @@ -1,3 +1,7 @@ +2010-04-21 Glenn Morris <rgm@gnu.org> + + * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles. + 2010-04-21 Karel Klíč <kklic@redhat.com> * configure.in: New option: --with(out)-selinux, on by default.
--- a/configure.in Tue Apr 20 20:11:03 2010 -0700 +++ b/configure.in Tue Apr 20 20:33:04 2010 -0700 @@ -1734,14 +1734,15 @@ dnl SELinux is available for GNU/Linux only. HAVE_LIBSELINUX=no +LIBSELINUX_LIBS= if test "${with_selinux}" = "yes"; then AC_CHECK_LIB([selinux], [lgetfilecon], HAVE_LIBSELINUX=yes, HAVE_LIBSELINUX=no) if test "$HAVE_LIBSELINUX" = yes; then AC_DEFINE(HAVE_LIBSELINUX, 1, [Define to 1 if using SELinux.]) LIBSELINUX_LIBS=-lselinux - AC_SUBST(LIBSELINUX_LIBS) fi fi +AC_SUBST(LIBSELINUX_LIBS) dnl Do not put whitespace before the #include statements below. dnl Older compilers (eg sunos4 cc) choke on it.
--- a/src/ChangeLog Tue Apr 20 20:11:03 2010 -0700 +++ b/src/ChangeLog Tue Apr 20 20:33:04 2010 -0700 @@ -1,3 +1,7 @@ +2010-04-21 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBSELINUX_LIBS): Move out of #ifdef. + 2010-04-21 Karel Klíč <kklic@redhat.com> * Makefile.in (LIBSELINUX_LIBS): New.
--- a/src/Makefile.in Tue Apr 20 20:11:03 2010 -0700 +++ b/src/Makefile.in Tue Apr 20 20:33:04 2010 -0700 @@ -92,6 +92,8 @@ RSVG_LIBS= @RSVG_LIBS@ RSVG_CFLAGS= @RSVG_CFLAGS@ +LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ + INTERVALS_H = dispextern.h intervals.h composite.h GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ @@ -243,10 +245,6 @@ DBUS_OBJ = dbusbind.o #endif -#ifdef HAVE_LIBSELINUX -LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ -#endif - /* DO NOT use -R. There is a special hack described in lastfile.c which is used instead. Some initialized data areas are modified at initial startup, then labeled as part of the text area when