Commit 2807228d authored by Glenn Morris's avatar Glenn Morris

Remove LIBSELINUX_LIBS need for cpp in Makefiles.

* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
* src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
parent 022c122a
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.
......
......@@ -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.
......
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.
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment