Remove LIBSELINUX_LIBS need for cpp in Makefiles.

* configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
* src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.

4 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9daf189b088..35c5b617723 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/configure.in b/configure.in
index ce297106f6d..d96b4e987c6 100644
--- a/configure.in
+++ b/configure.in
@@ -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.
diff --git a/src/ChangeLog b/src/ChangeLog
index 2da967958cd..716e6240320 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
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@
 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