Only include selinux libs in libdevmapper.pc when selinux build enabled.

diff --git a/WHATS_NEW b/WHATS_NEW
index b0d37be67e392bc3ccf3833e48ab2d3b93c03e46..1c977fbac226b9b50ea7839bb34b03318f0b9402 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.54 -
 =====================================
+  Only include selinux libs in libdevmapper.pc when selinux build enabled.
   Allow for a build directory separate from the source.
   Update distclean target for rename clogd to cmirrord. (2.02.52)
   Only do lock conversions in clvmd if we are explicitly asked for one.

diff --git a/configure b/configure
index ae4237715b636a8a28c115e93e2e5ec124b98724..37d634f3326475c8091992762e149dc62ba52bdd 100755 (executable)
--- a/configure
+++ b/configure
@@ -651,6 +651,7 @@ UDEV_RULES
 STATIC_LINK
 STATICDIR
 SNAPSHOTS
+SELINUX_LIBS
 POOL
 PKGCONFIG
 OWNER
@@ -12910,7 +12911,7 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_SEPOL 1
 _ACEOF
 
-               LIBS="-lsepol $LIBS"
+               SELINUX_LIBS="-lsepol $SELINUX_LIBS"
        fi
 
        { $as_echo "$as_me:$LINENO: checking for is_selinux_enabled in -lselinux" >&5
@@ -12991,11 +12992,12 @@ cat >>confdefs.h <<\_ACEOF
 #define HAVE_SELINUX 1
 _ACEOF
 
-               LIBS="-lselinux $LIBS"
+               SELINUX_LIBS="-lselinux $SELINUX_LIBS"
        else
                { $as_echo "$as_me:$LINENO: WARNING: Disabling selinux" >&5
 $as_echo "$as_me: WARNING: Disabling selinux" >&2;}
        fi
+       LIBS="$SELINUX_LIBS $LIBS"
 
        # With --enable-static_link and selinux enabled, linking
        # fails on at least Debian unstable due to unsatisfied references
@@ -15522,6 +15524,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
 
 
 
+
 
 
 ################################################################################

diff --git a/configure.in b/configure.in
index bf360ed145ef6f833ae6314730c618f5eadf1d4e..b4e7f28b8878263ce99bb65cb722411558be5180 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -841,17 +841,18 @@ if test x$SELINUX = xyes; then
        if test x$HAVE_SEPOL = xyes; then
                AC_DEFINE([HAVE_SEPOL], 1,
                  [Define to 1 if sepol_check_context is available.])
-               LIBS="-lsepol $LIBS"
+               SELINUX_LIBS="-lsepol $SELINUX_LIBS"
        fi
 
        AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
 
        if test x$HAVE_SELINUX = xyes; then
                AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-               LIBS="-lselinux $LIBS"
+               SELINUX_LIBS="-lselinux $SELINUX_LIBS"
        else
                AC_MSG_WARN(Disabling selinux)
        fi
+       LIBS="$SELINUX_LIBS $LIBS"
 
        # With --enable-static_link and selinux enabled, linking
        # fails on at least Debian unstable due to unsatisfied references
@@ -1126,6 +1127,7 @@ AC_SUBST(SACKPT_CFLAGS)
 AC_SUBST(SACKPT_LIBS)
 AC_SUBST(SALCK_CFLAGS)
 AC_SUBST(SALCK_LIBS)
+AC_SUBST(SELINUX_LIBS)
 AC_SUBST(SNAPSHOTS)
 AC_SUBST(STATICDIR)
 AC_SUBST(STATIC_LINK)

diff --git a/libdm/libdevmapper.pc.in b/libdm/libdevmapper.pc.in
index 5d2aa1773587fa64ff285b09b3ca20c8f2a9ad73..b657090ffeb6b1da989dbca4c0ffed07b7350e71 100644 (file)
--- a/libdm/libdevmapper.pc.in
+++ b/libdm/libdevmapper.pc.in
@@ -8,4 +8,4 @@ Description: device-mapper library
 Version: @DM_LIB_PATCHLEVEL@
 Cflags: -I${includedir} 
 Libs: -L${libdir} -ldevmapper
-Libs.private: -lselinux -lsepol
+Libs.private: @SELINUX_LIBS@