shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Alasdair Kergon 2009-10-05 12:11:30 +00:00
parent db8b5af9d9
commit e1b8a236b7
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -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.

7
configure vendored
View File

@ -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}'`
################################################################################

6
configure.in
View File

@ -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)

2
libdm/libdevmapper.pc.in
View File

@ -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@