diff options
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libdm/libdevmapper.pc.in | 2 |
4 files changed, 11 insertions, 5 deletions
@@ -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. @@ -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 @@ -15524,6 +15526,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'` + ################################################################################ ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile" diff --git a/configure.in b/configure.in index bf360ed1..b4e7f28b 100644 --- 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 5d2aa177..b657090f 100644 --- 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@ |