From 4fb0d62802ac10c4138f1a6f5a82b47f0c6d75e8 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Mon, 13 Jul 2015 10:02:12 +0200 Subject: [PATCH] build: remove SELinux AM_CONDITIONAL from configure.ac --- configure.ac | 1 - src/Makefile.am | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index ce2d9299d..a6cf8d815 100644 --- a/configure.ac +++ b/configure.ac @@ -493,7 +493,6 @@ if test "$have_selinux" = "yes"; then else AC_DEFINE(HAVE_SELINUX, 0, [Define if you have SELinux support]) fi -AM_CONDITIONAL(HAVE_SELINUX, test "${have_selinux}" = "yes") # libnl support for the linux platform PKG_CHECK_MODULES(LIBNL, libnl-3.0 >= 3.2.8 libnl-route-3.0 libnl-genl-3.0) diff --git a/src/Makefile.am b/src/Makefile.am index e457cbc3d..46f02aec1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -459,16 +459,13 @@ libNetworkManager_la_LIBADD = \ $(SYSTEMD_JOURNAL_LIBS) \ $(LIBNDP_LIBS) \ $(LIBDL) \ - $(LIBM) + $(LIBM) \ + $(SELINUX_LIBS) if WITH_LIBSOUP libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS) endif -if HAVE_SELINUX -libNetworkManager_la_LIBADD += $(SELINUX_LIBS) -endif - NetworkManager_LDFLAGS = -rdynamic ######################