Author: guillem
Date: 2006-02-08 04:16:41 +0000 (Wed, 08 Feb 2006)
New Revision: 91
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/debian/control
trunk/m4/libs.m4
Log:
Use pkg-config to get the proper flags to link against libselinux.
Add a Build-Dependency on pkg-config, thighten libselinux1-dev to
at least version 1.28-4 which provides a .pc file, and remove
libsepol1-dev as libselinux1-dev is Depending on it.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-07 21:08:46 UTC (rev 90)
+++ trunk/ChangeLog 2006-02-08 04:16:41 UTC (rev 91)
@@ -1,3 +1,12 @@
+2006-02-08 Guillem Jover <[EMAIL PROTECTED]>
+
+ * debian/contrl (Build-Depends): Depend on version >= 1.28-4 of
+ libselinux1-dev as it has pkg-config support. Remove libsepol1-dev,
+ now dragged by libselinux1-dev. Add pkg-config.
+ * m4/libs.m4 (DPKG_LIB_SELINUX): Use pkg-config to get the static
+ and dynamic linker flags, thus no more hardcoding the transitional
+ libraries.
+
2006-02-07 Nicolas Fran�ois <[EMAIL PROTECTED]>
* man/C/dselect.1: Fix a typo: replace '.sh' by '.sp'.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-07 21:08:46 UTC (rev 90)
+++ trunk/debian/changelog 2006-02-08 04:16:41 UTC (rev 91)
@@ -9,6 +9,10 @@
Thanks to Changwoo Ryu for noticing. Closes: #237915
* Mark some strings as translatable (Changwoo Ryu). Closes: #256387
* Remove a trailing 'C' character from update-alternatives manpage.
+ * Use pkg-config to get the proper flags to link against libselinux.
+ Add a Build-Dependency on pkg-config, thighten libselinux1-dev to
+ at least version 1.28-4 which provides a .pc file, and remove
+ libsepol1-dev as libselinux1-dev is Depending on it.
[ Frank Lichtenheld ]
* Let dpkg-source ignore comments in the hunk header as used by
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2006-02-07 21:08:46 UTC (rev 90)
+++ trunk/debian/control 2006-02-08 04:16:41 UTC (rev 91)
@@ -6,7 +6,7 @@
Origin: debian
Bugs: debbugs://bugs.debian.org
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev,
zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libsepol1-dev [!hurd-i386
!kfreebsd-i386], libselinux1-dev [!hurd-i386 !kfreebsd-i386], po4a
+Build-Depends: debhelper (>= 4.1.81), pkg-config, libncurses5-dev |
libncurses-dev, zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev (>=
1.28-4) [!hurd-i386 !kfreebsd-i386], po4a
Package: dpkg
Architecture: any
Modified: trunk/m4/libs.m4
===================================================================
--- trunk/m4/libs.m4 2006-02-07 21:08:46 UTC (rev 90)
+++ trunk/m4/libs.m4 2006-02-08 04:16:41 UTC (rev 91)
@@ -71,9 +71,9 @@
[AC_DEFINE(WITH_SELINUX, 1,
[Define to 1 to compile in SELinux supoprt])
if test "x$with_selinux" = "xstatic"; then
- dpkg_selinux_libs="-Wl,-Bstatic -lselinux -lsepol
-Wl,-Bdynamic"
+ dpkg_selinux_libs="-Wl,-Bstatic `pkg-config --static
--libs libselinux` -Wl,-Bdynamic"
else
- dpkg_selinux_libs="-lselinux"
+ dpkg_selinux_libs="`pkg-config --libs libselinux`"
fi
SELINUX_LIBS="${SELINUX_LIBS:+$SELINUX_LIBS
}$dpkg_selinux_libs"
with_selinux="yes"],
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
