[Emacs-diffs] /srv/bzr/emacs/trunk r99966: Remove LIBSELINUX_LIBS need for cpp in Makefiles.

[Glenn Morris]

------------------------------------------------------------
revno: 99966
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-20 20:33:04 -0700
message:
  Remove LIBSELINUX_LIBS need for cpp in Makefiles.
  
  * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
  * src/Makefile.in (LIBSELINUX_LIBS): Remove containing #ifdef.
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-04-21 03:02:58 +0000
+++ b/ChangeLog 2010-04-21 03:33:04 +0000
@@ -1,3 +1,7 @@
+2010-04-21  Glenn Morris  <address@hidden>
+
+       * configure.in (LIBSELINUX_LIBS): Always substitute in Makefiles.
+
 2010-04-21  Karel Klíč  <address@hidden>
 
        * configure.in: New option: --with(out)-selinux, on by default.

=== modified file 'configure.in'
--- a/configure.in      2010-04-21 03:02:58 +0000
+++ b/configure.in      2010-04-21 03:33:04 +0000
@@ -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.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-21 03:02:58 +0000
+++ b/src/ChangeLog     2010-04-21 03:33:04 +0000
@@ -1,3 +1,7 @@
+2010-04-21  Glenn Morris  <address@hidden>
+
+       * Makefile.in (LIBSELINUX_LIBS): Move out of #ifdef.
+
 2010-04-21  Karel Klíč  <address@hidden>
 
        * Makefile.in (LIBSELINUX_LIBS): New.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-04-21 03:02:58 +0000
+++ b/src/Makefile.in   2010-04-21 03:33:04 +0000
@@ -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