r663 - in lvm2/trunk/debian: . patches

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 10:27:29 2009
New Revision: 663

Log:
* debian/control: Build depend against pkg-config.
* debian/patches/libs-cleanup.patch: Use pkg-config for selinux detection.


Modified:
   lvm2/trunk/debian/control
   lvm2/trunk/debian/patches/libs-cleanup.patch

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	(original)
+++ lvm2/trunk/debian/control	Mon Feb 23 10:27:29 2009
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>> 4.2), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline5-dev, libselinux1-dev, quilt
+Build-Depends: debhelper (>> 4.2), automake, libcman-dev (>> 2), libdlm-dev (>> 2), libreadline5-dev, libselinux1-dev, pkg-config, quilt
 Standards-Version: 3.7.3
 
 Package: lvm2

Modified: lvm2/trunk/debian/patches/libs-cleanup.patch
==============================================================================
--- lvm2/trunk/debian/patches/libs-cleanup.patch	(original)
+++ lvm2/trunk/debian/patches/libs-cleanup.patch	Mon Feb 23 10:27:29 2009
@@ -1,23 +1,25 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -532,29 +532,18 @@
- 	if test x$HAVE_SEPOL = xyes; then
- 		AC_DEFINE([HAVE_SEPOL], 1,
- 		  [Define to 1 if sepol_check_context is available.])
+@@ -527,34 +527,9 @@
+ ################################################################################
+ dnl -- Check for selinux
+ if test x$SELINUX = xyes; then
+-	AC_CHECK_LIB(sepol, sepol_check_context, HAVE_SEPOL=yes, HAVE_SEPOL=no)
+-
+-	if test x$HAVE_SEPOL = xyes; then
+-		AC_DEFINE([HAVE_SEPOL], 1,
+-		  [Define to 1 if sepol_check_context is available.])
 -		LIBS="-lsepol $LIBS"
-+		LIBS_SEPOL="-lsepol"
- 	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.])
+-	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"
-+		LIBS_SELINUX="-lselinux"
-+		LIBS_SELINUX_STATIC="$LIBS_SELINUX $LIBS_SEPOL -lpthread"
- 	else
- 		AC_MSG_WARN(Disabling selinux)
- 	fi
+-	else
+-		AC_MSG_WARN(Disabling selinux)
+-	fi
 -
 -	# With --enable-static_link and selinux enabled, linking
 -	# fails on at least Debian unstable due to unsatisfied references
@@ -30,10 +32,13 @@
 -				LIB_PTHREAD=-lpthread])
 -		LIBS=$lvm_saved_libs
 -	fi
++	AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
++	LIBS_SELINUX="$(pkg-config --libs libselinux)"
++	LIBS_SELINUX_STATIC="$(pkg-config --libs --static libselinux)"
  fi
  
  ################################################################################
-@@ -755,6 +744,8 @@
+@@ -755,6 +730,8 @@
  AC_SUBST(JOBS)
  AC_SUBST(LDDEPS)
  AC_SUBST(LIBS)
@@ -42,7 +47,7 @@
  AC_SUBST(LIB_SUFFIX)
  AC_SUBST(LOCALEDIR)
  AC_SUBST(LVM1)
-@@ -769,7 +760,6 @@
+@@ -769,7 +746,6 @@
  AC_SUBST(SNAPSHOTS)
  AC_SUBST(STATICDIR)
  AC_SUBST(STATIC_LINK)