1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00

Remove LIBSELINUX_LIBS need for cpp in Makefiles.

* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
* src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
This commit is contained in:
Glenn Morris 2010-04-20 20:33:04 -07:00
parent 022c122ac7
commit 2807228d2c
4 changed files with 12 additions and 5 deletions

View File

@ -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.

View File

@ -1734,14 +1734,15 @@ fi
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.

View File

@ -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.

View File

@ -92,6 +92,8 @@ CFLAGS_SOUND= @CFLAGS_SOUND@
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 @@ shared=no
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