build: remove SELinux AM_CONDITIONAL from configure.ac
authorBeniamino Galvani <bgalvani@redhat.com>
Mon, 13 Jul 2015 08:02:12 +0000 (10:02 +0200)
committerBeniamino Galvani <bgalvani@redhat.com>
Tue, 4 Aug 2015 06:46:11 +0000 (08:46 +0200)
configure.ac
src/Makefile.am

index ce2d929..a6cf8d8 100644 (file)
@@ -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)
index e457cbc..46f02ae 100644 (file)
@@ -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
 
 ######################